Commit graph

1620 commits

Author SHA1 Message Date
Riyad Preukschas 9a4c22d395 Remove unnecessary check in Markdown helper 2012-09-08 01:11:32 +02:00
Riyad Preukschas f4a90bc9f3 Add emoji docs to Markdown help 2012-09-08 01:09:12 +02:00
Riyad Preukschas 130520fa5e Reorder blocks in Markdown help 2012-09-08 01:09:09 +02:00
Dmitriy Zaporozhets 7b50a7c99d Merge pull request #1402 from AlexDenisov/preselected_milestone_while_create_new_issue
Preselected milestone and assignee while create new issue
2012-09-07 11:10:27 -07:00
Alex Denisov 1b83af6eed IssueController#new refactored 2012-09-07 20:59:12 +03:00
randx 367e17cc84 5xx error status code for gitolite & encoding error 2012-09-07 20:47:52 +03:00
randx 048117c05d projects helper added 2012-09-07 19:57:13 +03:00
Alex Denisov f789476241 Merge branch 'master' into preselected_milestone_while_create_new_issue 2012-09-07 17:20:20 +03:00
Alex Denisov b462b0c6eb Pre-selected assignee implemented 2012-09-07 16:52:48 +03:00
Alex Denisov 26552051b7 Pre-selected milestone implemented 2012-09-07 16:35:59 +03:00
Dmitriy Zaporozhets fed6ab2481 Change representation of team members. Group by role 2012-09-07 10:42:41 +03:00
Alex Denisov 85db51f660 don't send notification when UsersProject destroyed 2012-09-07 10:23:45 +03:00
Dmitriy Zaporozhets 61c7449321 Bulk user add on project -> new team member 2012-09-07 09:50:35 +03:00
Alex Denisov ed4fbcf6b0 Merge branch 'master' into fix_project_access_notification 2012-09-07 09:39:34 +03:00
Dmitriy Zaporozhets 4f8a4aa44c Merge pull request #1384 from tsigo/emoji
Emoji!
2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets 79021e674b Split gitolite backend. Use gitolite_config methods moved to separate class 2012-09-07 08:16:29 +03:00
Robert Speicher 8fdeb43c36 Fix Help/Markdown: Take 2 2012-09-06 17:20:57 -04:00
Robert Speicher 34a48d55cc Revert "Change @project instance variable to a local in views/help/markdown"
This reverts commit 6471d8c652.
2012-09-06 17:17:56 -04:00
Robert Speicher bde19c061a Update failure message for UsersProject uniqueness validation
Was "User has already been taken", is now "User already exists in
project".
2012-09-06 16:51:28 -04:00
Robert Speicher 2faa4bba40 Update Note#upvote? to support emoji voting 2012-09-06 15:31:25 -04:00
Robert Speicher 8808c5fa8d Merge branch 'master' into emoji 2012-09-06 15:23:42 -04:00
Dmitriy Zaporozhets a595f8944a Merge pull request #1392 from NARKOZ/refactoring
refactor factory specs
2012-09-06 08:11:41 -07:00
Nihad Abbasov 46b9aafc39 add missing selector to projects.js 2012-09-06 07:56:33 -07:00
Dmitriy Zaporozhets b57620e23b Merge branch 'normalize_capitalization' of https://github.com/AlexDenisov/gitlabhq into AlexDenisov-normalize_capitalization 2012-09-06 17:36:04 +03:00
Nihad Abbasov 66684d6d50 move code from application.js to separate file 2012-09-06 05:47:13 -07:00
Nihad Abbasov 88d394d396 cleanup projects.coffee 2012-09-06 05:44:44 -07:00
Nihad Abbasov e7c2ee57aa delete unnecessary team.js 2012-09-06 05:06:01 -07:00
Nihad Abbasov 06acc115ed rewrite snippets.js in coffeescript 2012-09-06 04:51:42 -07:00
Nihad Abbasov f8b588808e rewrite loader.js in coffeescript 2012-09-06 04:50:01 -07:00
Nihad Abbasov 08d9421dd9 rewrite graph.js in coffeescript 2012-09-06 04:32:31 -07:00
Nihad Abbasov 60e18e2636 rewrite admin.js in coffeescript 2012-09-06 04:32:01 -07:00
Nihad Abbasov c106bb7096 minor refactoring of commits controller 2012-09-06 04:03:46 -07:00
Alex Denisov 562af7a6a2 Merge branch 'master' into normalize_capitalization 2012-09-06 11:40:56 +03:00
Alex Denisov 09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
Robert Speicher 90f587f4ee Move the entire gfm method to Gitlab::Markdown, which will be a module now 2012-09-05 16:06:20 -04:00
Robert Speicher d480a478c1 Add emoji image files 2012-09-05 16:04:41 -04:00
randx 21bfd1e7fc minor css improvements 2012-09-05 23:00:10 +03:00
Nihad Abbasov 0b559cdece add validations for boolean attributes 2012-09-05 04:01:11 -07:00
Dmitriy Zaporozhets 982a4095c1 Use tw style for some buttons. Improved deploy key UI 2012-09-05 08:56:59 +03:00
Robert Speicher 5e1c63d3f0 Move load_refs out of ApplicationController and into CommitsController
That was the only place it was used.
2012-09-05 01:13:41 -04:00
Robert Speicher a9f275bc20 Fix load_refs in ApplicationController after default_branch change
As a last resort it was calling a method that didn't exist. Woops!
2012-09-05 01:12:44 -04:00
Robert Speicher 443e23e61a Add Repository#discover_default_branch and add it to PushObserver 2012-09-05 01:01:20 -04:00
Robert Speicher f06d98e907 Add SetDefaultBranchDefaultToNil migration
default_branch now defaults to nil, not 'master'. It will be set after the first
push by discover_default_branch.
2012-09-05 01:00:07 -04:00
Robert Speicher 0bc4ecfedd Change projects/empty to include the clone_panel partial instead of duplicating 2012-09-04 12:05:21 -04:00
Robert Speicher 82a3996883 Remove projects/_show partial
I have no earthly idea what this file was for, but I couldn't find it being
rendered anywhere.
2012-09-04 12:05:21 -04:00
Robert Speicher a463353773 Add "empty_repo?" method to Repository role
Replaces two calls that this method simplifies
2012-09-04 12:05:21 -04:00
Robert Speicher 7e76610d0a Update the projects js file to coffeescript; refactor the clone panel switcher 2012-09-04 12:05:20 -04:00
Robert Speicher c1ff89fa2a Rename projects.js to projects.js.coffee 2012-09-04 11:30:49 -04:00
Dmitriy Zaporozhets c347fd3f88 Merge pull request #1366 from tsigo/markdown_help
Change @project instance variable to a local in views/help/markdown
2012-09-04 00:28:04 -07:00
Robert Speicher 6471d8c652 Change @project instance variable to a local in views/help/markdown
It was erroneously appending the project name to the page's title, even
though the Help system isn't specific to one project.
2012-09-04 03:18:26 -04:00
Robert Speicher d29827433d Update User#identifier to conform to Gitolite 2.x's user pattern
Also modifies the specs a bit because I can't help myself.

Closes #480
2012-09-04 00:20:17 -04:00
Robert Speicher b44e9a08d5 Add Milestone link to API help TOC
[ci skip]
2012-09-03 20:38:41 -04:00
randx 5db2dbdcf1 fix browse file css 2012-09-03 22:57:34 +03:00
randx f557686eb2 git clone panel available on files tab too 2012-09-03 22:30:14 +03:00
Alex Denisov 38b17e4e06 Merge branch 'master' into fix_project_access_notification 2012-09-03 22:20:29 +03:00
randx 8ca0b75d05 Tables refactored 2012-09-03 21:53:16 +03:00
Alex Denisov af63607a5c test_after_commit gem added 2012-09-03 21:46:17 +03:00
Alex Denisov 1f1c8094fe After commit instead of after_update 2012-09-03 20:48:38 +03:00
Dmitriy Zaporozhets c7cfe3d83b devise session templates to haml. Fix problem with missing message in commit 2012-09-03 08:15:07 +03:00
Dmitriy Zaporozhets 6997543ac2 Merge pull request #1351 from tsigo/nonrelative_resque
Give Resque route a name and use that for the iframe src
2012-09-02 11:58:13 -07:00
Dmitriy Zaporozhets f9711cd81a Merge pull request #1355 from tsigo/gfm_spec_cleanup
GFM spec redesign
2012-09-02 11:57:33 -07:00
Robert Speicher 40d619107f Add link_title to CommitDecorator 2012-09-02 13:40:14 -04:00
Robert Speicher 8db2a59d0b Add StaticModel role, and add it to Commit model
Instead of doing this:

    link_to(commit.id, project_commit_path(project, id: commit.id))
    Note.create(noteable_id: commit.id, noteable_type: "Commit", ...)

It lets us do this:

    link_to(commit.id, project_commit_path(project, commit))
    Note.create(noteable: commit, ...)
2012-09-02 13:40:07 -04:00
randx aecbd313bc Fix glm by adding id and classes to sanitize white attrs 2012-09-02 15:25:54 +03:00
randx beb5e1bd6b Sanitize glm helper 2012-09-01 23:35:04 +03:00
randx adeeae9f73 Few fixes for ~ 1000px resolution 2012-09-01 22:21:28 +03:00
Robert Speicher 0de5d08e37 Give Resque route a name and use that for the iframe src
Closes #1350
2012-08-31 19:28:32 -04:00
Florian Unglaub 0dd94cd86e DRY'ed up the user model 2012-08-31 16:44:23 +02:00
Florian Unglaub 1b0198f1d3 save newly created users directly in the model 2012-08-31 16:24:12 +02:00
Florian Unglaub 6d6c7a17ea Allow single-sign-on with Omniauth 2012-08-31 15:45:50 +02:00
Dmitriy Zaporozhets ed954ebae2 Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications
Issue status changed notifications
2012-08-31 00:51:31 -07:00
randx 65abd8b20a Freeze project path in admin area 2012-08-31 09:05:44 +03:00
randx 5e510ada7a Js validation for title presence in issue, mr, milestone 2012-08-30 22:28:45 +03:00
randx b9ff0c79b4 Changed filters to readable one. Styled some stuff 2012-08-30 22:15:34 +03:00
randx 4a6596af27 Fixed bunch of js bugs with comments. Also added development tips 2012-08-30 21:31:55 +03:00
randx 92137b7beb Removed class 'small' for some buttons. Fixed issue creation 2012-08-30 20:00:16 +03:00
randx d246a68a24 fix project.last_activity spec 2012-08-30 19:45:05 +03:00
Dmitriy Zaporozhets cd3d50caf2 Changed colors for buttons. Imporved preview area. Added clone panel to empty project 2012-08-30 09:27:02 +03:00
Dmitriy Zaporozhets 4e47402852 Fixed project last_activity. Links color changed a bit 2012-08-30 09:09:42 +03:00
Dmitriy Zaporozhets 793db070f0 Restyled projects list on dashboard 2012-08-30 08:13:36 +03:00
randx 51558bd57a Refactoring scss & improving some UI elements 2012-08-29 22:29:50 +03:00
randx 1dd938d20c SCSS refactoring & cleanup. First iteration 2012-08-29 21:23:43 +03:00
Alex Denisov 2703fe3e72 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:42:15 +03:00
Alex Denisov 05af5655a7 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:21:14 +03:00
Alex Denisov 43cad71f1a Duplicate code removed from IssueObserver#after_update 2012-08-29 10:50:35 +03:00
Alex Denisov 2cb0a62f7d Notification sends to issue author and assignee if issue being reopened or closed 2012-08-29 10:48:17 +03:00
Alex Denisov 4d65532158 Issue_status_changed email added 2012-08-29 09:49:39 +03:00
randx e5adca1b81 Preview as button. Disable note submit unless content 2012-08-29 08:13:38 +03:00
Robert Speicher 8a49cdc3b4 Add milestone API docs to doc/README and views/help/api
Also removes `closed` attribute option from create action.
2012-08-29 08:45:00 -04:00
Dmitriy Zaporozhets adc71b6a6a Fix test i broke with ssk key validation. Added Key.user_id as attr_protected 2012-08-29 07:58:22 +03:00
Dmitriy Zaporozhets 5afb16e496 Add ssh key validation 2012-08-29 07:13:29 +03:00
randx ad3a88cfd3 Prepared for gitolite v3 2012-08-29 02:03:04 +03:00
Dmitriy Zaporozhets 1f5e2658f5 Merge pull request #1412 from tsigo/more_coffeescript
Convert main.js to CoffeeScript
2012-09-09 06:48:33 -07:00
Robert Speicher 5dcca7e480 Remove some JS that is no longer used 2012-09-09 07:28:42 -04:00
Robert Speicher 3551df8eb1 Minor main.js refactor and docs 2012-09-09 07:28:41 -04:00
Robert Speicher ad1aa517c7 Add "enable" and "disable" jQuery functions
Handles (un)setting the disabled attribute and adding/removing the
'disabled' class
2012-09-09 07:28:41 -04:00
Robert Speicher 3b89f14090 Convert main.js to coffee
Remove duplicate 's' hotkey code
2012-09-09 07:28:41 -04:00
Robert Speicher 93daa8c568 Move main.js to main.js.coffee 2012-09-09 07:28:41 -04:00
Robert Speicher 1c01536829 Fix spelling of "empty" in disableButtonIfEmptyField function name 2012-09-09 07:28:41 -04:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup
Use GitHub::Markup to parse markup files
2012-09-09 03:34:50 -07:00
miks 2e76342d72 typo fixed 2012-09-08 12:37:23 +03:00
miks 4226458faf Merge branch 'master' into project_users_api 2012-09-08 10:50:24 +03:00
miks 2dc0519277 bulk access roles update/deletion added 2012-09-06 23:14:42 +03:00
Robert Speicher 52c521ffe8 Use GitHub::Markup to parse markup files
Closes #1382
2012-09-05 16:52:49 -04:00
Robert Speicher b78fd0c130 Add github-markup gem 2012-09-05 16:50:03 -04:00
randx b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
randx 7cdc5b9e04 Use similar interface to access gitolite
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
2012-08-29 00:04:06 +03:00
Riyad Preukschas 1f1ce5fbd4 Revamp GFM user docs. 2012-08-27 21:20:26 +02:00
Riyad Preukschas 806695f491 Split and reformat markdown options and add refs to their docs.
Also add hard_wrap option.
2012-08-27 21:20:13 +02:00
Riyad Preukschas 58a581782b Update forms to show consistent link to GFM. 2012-08-27 20:55:01 +02:00
Dmitriy Zaporozhets cb35a80e49 Merge pull request #993 from veprbl/fix_archiving_prefix
Download button: put files into a directory
2012-08-27 11:04:00 -07:00
Dmitriy Zaporozhets cb6fcb6562 Merge pull request #1301 from Mikulas/help-web-hooks-typo
fix web hooks help view commit count off by one
2012-08-27 04:58:32 -07:00
Dmitriy Zaporozhets 65444ba311 Merge pull request #1307 from purwandi/master
use high quality icon on folder icon
2012-08-27 01:33:06 -07:00
Purwandi 28cc4de267 Replace folder icon to use high quality 2012-08-27 12:43:28 +07:00
Alex Denisov 3c96d1f0e1 Send notification on update UserProject relation (access changed) 2012-08-27 00:32:03 +03:00
Alex Denisov aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
randx 2c32574ac3 Project git clone panel 2012-08-25 23:39:01 +03:00
Dmitriy Zaporozhets efde86537a Merge pull request #1110 from gliptak/patch-1
Display configured git repository location on error page
2012-08-25 13:04:41 -07:00
Dmitriy Zaporozhets 79e936e632 Merge pull request #1300 from tsigo/spec_reorganize
Spec cleanup/reorganization
2012-08-25 13:03:44 -07:00
Mikuláš Dítě e0cd807020 fix web hooks help view commit count off by one 2012-08-25 20:48:30 +02:00
Robert Speicher 580ce4f2d8 Minor cleanup to Milestone model and spec
Back-ported from my still-in-progress major cleanup.
2012-08-25 14:19:16 -04:00
randx 6ff0652e9e Admin area -> user form 2012-08-25 20:31:19 +03:00
randx f13bccc14b better flash message style 2012-08-25 19:47:00 +03:00
randx c05692b7b1 scss refactoring 2012-08-25 19:42:34 +03:00
randx fee26c58e2 Move snippets api doc to separate file 2012-08-25 19:21:11 +03:00
Florian Unglaub 36ffdf36b9 Merge issue fixed 2012-08-24 15:40:44 +02:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
randx d5fcf0f672 Show labels specific to project 2012-08-24 15:34:27 +03:00
Dmitriy Zaporozhets 8d65f51e63 Merge pull request #1295 from jouve/fix_mr_form
fix merge request form
2012-08-25 06:16:40 -07:00
Joe Hillenbrand 0dbde913dc Hide gravatar tip if gravatar is disabled. 2012-08-24 16:04:07 -07:00
Cyril 2b38f51a17 fix merge request form 2012-08-25 00:22:45 +02:00
randx 3dd7703b80 Feature: Labels page. Index page 2012-08-24 13:05:40 +03:00
Dmitriy Zaporozhets 52f657aa15 Merge pull request #1286 from steveklabnik/master
Misspelled Draper
2012-08-24 01:29:52 -07:00
Steve Klabnik f9ab136abd Misspelled Draper
:)
2012-08-23 17:01:30 -07:00
Cyril e2f19befbc fix inline forms 2012-08-23 23:04:43 +02:00
Riyad Preukschas 32ae7fb616 Improve GFM code documentation 2012-08-23 20:10:06 +02:00
Dmitriy Zaporozhets 0e5dbd1caf Merge pull request #1231 from NARKOZ/preview_notes
Preview window is not closed after post
2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets 7ab587a477 Merge pull request #1263 from dosire/merge_base_for_merge_request
Show only the commits that are newer in the merge request.
2012-08-23 00:32:37 -07:00
Dmitriy Zaporozhets 1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar
Allow disabling Gravatars in gitlab.yml settings
2012-08-22 04:33:50 -07:00
Dmitriy Zaporozhets aa50408ecb 1. Better message if no ssh key
2. SSH Keys Help page
2012-08-22 03:56:53 +03:00
Sytse Sijbrandij 9ec4c2d214 Show only the commits that are newer in the merge request. 2012-08-21 23:07:11 +02:00
randx 3784f134f1 Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify 2012-08-21 21:34:33 +03:00
randx f088eaa972 Refactoring & minor css changes 2012-08-21 21:26:56 +03:00
randx 7fa6a23416 Better fonts for all code like wiki etc 2012-08-21 20:53:33 +03:00
randx c625293b99 Handle post-receive files via gitolite, not gitlab 2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets 2e7ca8c866 Show only tm events related to this project 2012-08-21 08:20:11 +03:00
randx 366c0065c4 Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap
Conflicts:
	app/models/user.rb
2012-08-21 08:39:23 +03:00
Robert Speicher c5b13cc989 Remove more duplication in the Notify mailer 2012-08-20 23:18:57 -04:00
Robert Speicher 652d955c92 Remove some duplication in the Notify mailer 2012-08-20 23:04:53 -04:00
randx b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
Jakub Jirutka 335b3ed197 fix condition in find_for_ldap_auth 2012-08-20 12:58:03 +02:00
randx d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
randx 8eaead6a01 Text message for mergeing MR 2012-08-19 00:45:46 +03:00
randx 7530fa9dec Restored margin for text in notes 2012-08-19 00:08:20 +03:00
randx 3f9749dd86 Fix branch selector. Few css fixed also 2012-08-18 23:53:58 +03:00
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets 93401ef988 Few css improvements 2012-08-17 09:26:59 +03:00
Dmitriy Zaporozhets 813814f02e Application cleanup 2012-08-17 09:09:11 +03:00
Dmitriy Zaporozhets 4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter
Allow filtering issues that have no milestone or assignee
2012-08-16 22:33:56 -07:00
Robert Speicher feee3838e1 Combine unassigned_issue and unassigned_milestone into unassigned_filter 2012-08-16 18:13:22 -04:00
Robert Speicher 66399d558d Merge branch 'master' into hooray_apostrophes 2012-08-16 14:03:06 -04:00
Dmitriy Zaporozhets 05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Robert Speicher 65bcc41f3e Allow disabling Gravatars in gitlab.yml settings
Closes #1237
2012-08-15 21:06:08 -04:00
Martin Bastien 6641761e5c Fix current class for hooks tab in admin section
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
2012-08-15 00:03:13 -04:00
Robert Speicher 70174a1e1a More minor translation/grammar fixes on error pages 2012-08-14 17:26:38 -04:00
Robert Speicher b039a16946 GFM refactor: Move the actual parsing to a class under the Gitlab module 2012-08-14 04:37:18 -04:00
Robert Speicher e31a9dd253 GFM refactor: Update pattern to avoid an extra HTML entities check 2012-08-14 04:33:46 -04:00
Robert Speicher d1d19aecde GFM refactor: Simplify the regex pattern
Makes use of 'extended' patterns to add comments to the groups, and also
reduces the total number of groups to just those that are used.
2012-08-14 04:33:41 -04:00
Nihad Abbasov 0b7e67ad12 fix note preview link, and hide preview and errors after posting a comment 2012-08-14 01:24:27 -07:00
Robert Speicher 6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Robert Speicher 5a90d044f7 Allow filtering by issues with no assigned... assignee
Continues #1222
2012-08-13 20:49:18 -04:00
Dmitriy Zaporozhets 6ebd360cf2 Modern theme restyled. Better Profile -> Ui page 2012-08-13 08:52:10 +03:00
Robert Speicher b1ea0b3c01 Allow filtering by issues with no assigned milestone
Closes #1222
2012-08-13 01:38:00 -04:00
randx bd0c971aa9 Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard
Conflicts:
	app/views/events/_commit.html.haml
2012-08-12 00:33:32 +03:00
randx 731b6be9c9 Handle app crash on huge commits 2012-08-11 15:59:36 +03:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
Cyril 15fc0f0c10 fix commit events on dashboard 2012-08-10 21:23:54 +02:00
Dmitriy Zaporozhets 1413c23c50 Merge pull request #1208 from tsigo/issue_commonality
Consolidate functionality shared between Issue and MergeRequest
2012-08-10 06:48:16 -07:00
Dmitriy Zaporozhets 5fd0e7ba11 Merge pull request #1198 from NARKOZ/preview_notes
ability to preview notes
2012-08-10 06:42:31 -07:00
Nihad Abbasov 9639780359 render notes preview on server-side 2012-08-09 23:47:48 -07:00
Robert Speicher b7f9b8223e Fix search class method for IssueCommonality
Also adds specs to the two affected classes that would have caught my
dumb mistake.
2012-08-09 13:45:12 -04:00
Robert Speicher f36f0dac9d Consolidate functionality shared between Issue and MergeRequest
Any associations, validations, delegates, scopes and methods that
were exactly the same in both Issue and MergeRequest models have been
moved to a new IssueCommonality module (role) that gets included by each
class.

There was actually quite a bit of duplication, because MergeRequests are
basically just specialized Issues.
2012-08-08 21:44:33 -04:00
Robert Speicher 7a4c958882 Add empty IssueCommonality module; include in Issue and MergeRequest 2012-08-08 21:26:56 -04:00
Dmitriy Zaporozhets 839757598b Wiki pages page 2012-08-09 07:34:29 +03:00
Dmitriy Zaporozhets 8ffb6126a9 slim comment form 2012-08-09 06:36:55 +03:00
Dmitriy Zaporozhets a76adfa472 Fixed gfm mailer 2012-08-09 06:02:55 +03:00
randx f197fa1fbf Fix github issue #1153 2012-08-08 17:08:43 +03:00
randx 04bad8257f Fixed markdown tests 2012-08-08 11:52:09 +03:00
Nihad Abbasov 1ec3bd3f8d ability to preview notes 2012-08-08 01:12:05 -07:00
Jakub Jirutka ad265b9610 Adding workaround for backward compatibility with legacy LDAP users 2012-08-05 11:27:17 +02:00
randx 6171a4d8eb Fixed dashboard broken messages cause of glm 2012-08-03 03:28:02 +03:00
randx 34ba4e1352 Gitlab Markdown help page 2012-08-03 00:20:09 +03:00
Riyad Preukschas 5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Riyad Preukschas 9a0b763eec Fix missing @project errors 2012-08-06 03:16:06 +02:00
Riyad Preukschas 6f9428b1cd Fix GFM helper to raise an exception when @project is not set 2012-08-06 02:32:17 +02:00
Riyad Preukschas 8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
Valeriy Sizov 1c60c3d73d Merge pull request #1147 from miks/master
Add automatic HTML id attributes to markdown headings to allow linking to content sections in wiki
2012-08-04 10:30:05 -07:00
Valeriy Sizov c757924902 Merge pull request #1184 from karuna/master
Hook url should be able to contain http basic authentication
2012-08-04 10:17:14 -07:00
randx 7dd276817c Rack mini profiler for dev env 2012-08-02 09:48:53 +03:00
randx 9b4c41f826 Fix github issue #1190 2012-08-02 09:07:01 +03:00
Valeriy Sizov 3079687b93 Merge pull request #1179 from robbytaylor/master
Grammar fix after creating a project
2012-08-02 09:27:10 -07:00
gitlab system 9912770c6f make hooks respect http basic authentication 2012-08-02 09:48:46 +07:00
Riyad Preukschas eb06dd79f8 Update views for GFM 2012-08-02 02:54:57 +02:00
Riyad Preukschas 0a60b19b23 Remove the commit_msg_with_link_to_issues helper and specs 2012-08-02 02:54:10 +02:00
Riyad Preukschas 6873d07f62 Add link_to_gfm helper and specs 2012-08-02 02:54:01 +02:00
Riyad Preukschas 8ce390333a Add GFM helper 2012-08-02 02:41:49 +02:00
Riyad Preukschas e1b4e22e5c Add render context to markdown renderer 2012-08-01 17:37:12 +02:00
Rob Taylor 516a76c9a9 Fixed grammar in 'please wait' message after creating project 2012-08-01 11:19:20 +01:00
Jakub Jirutka fa5a53f5ed Change identification of users with extern auth provider (LDAP) 2012-07-29 16:15:52 +02:00
randx e8261313a7 Fixed firefox css bug with issues table 2012-07-28 05:43:34 +03:00
randx 00b280c3f9 Feature: Bulk Issues update 2012-07-28 03:35:43 +03:00
Dmitriy Zaporozhets 5926bbac12 Backend Refactoring 2012-07-31 08:32:49 +03:00
randx 69e41250d1 Styled New/Edit Project for admin area 2012-07-28 00:42:44 +03:00
randx 2cf5a9efbc Better name for Project push methods module 2012-07-29 20:08:58 +03:00
randx c6034af44e Styled Source Browse 2012-07-29 12:51:58 +03:00
randx c2817e6f3a Team Member Profile: Remove button rebased 2012-07-29 01:40:21 +03:00
randx 4c1267e09f CSS refactoring. Notes better styled 2012-07-29 01:34:51 +03:00
Dmitriy Zaporozhets e1344a08f0 Merge pull request #1163 from tomykaira/bug_1009
Fix #1009 Replace all special characters in user's identity
2012-07-28 07:46:40 -07:00
Dmitriy Zaporozhets 354d243878 Merge pull request #983 from JamesEarlDouglas/notify-grammar
cleanup the wording of the notification footer
2012-07-28 07:38:17 -07:00
tomykaira 03a2995e15 Fix #1009 Replace all special characters in user's identity 2012-07-28 22:05:25 +09:00
randx bc7897180d Better visibility of event commit links & commits ids 2012-07-28 00:27:54 +03:00
randx 9a709f76be Fix issue padding cause PR 1144 2012-07-27 23:57:42 +03:00
Dmitriy Zaporozhets f69049c282 Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased
Break up links with nested formating (rebased)
2012-07-27 13:48:05 -07:00
randx 0590aa9d60 commit.short_id as model method. Styled inline comment form 2012-07-27 11:22:05 +03:00
randx 18f83016b1 Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status 2012-07-26 16:14:34 +03:00
randx c27105f8c3 Fixed dashboard loader, fixed 404 for reporter on empty wiki page.
Styled Wiki edit page
2012-07-26 14:45:17 +03:00
miks 1127c98490 Add automatic HTML id attributes to markdown headings to allow linking
to content sections in wiki
2012-07-26 11:47:17 +03:00
Riyad Preukschas f6a67ef207 Update links in events 2012-07-25 22:27:25 +03:00
Riyad Preukschas 6fc6833cdb Fix styles
* don't show pointer cursor for for the whole list item any more
* fix hover color for links in .row_title
2012-07-25 21:11:58 +02:00
Riyad Preukschas 0aee7c94d0 Update links to milestones 2012-07-25 21:11:58 +02:00
Riyad Preukschas e6bb4f1491 Update links to merge requests 2012-07-25 21:11:58 +02:00
Riyad Preukschas 73dabcb357 Update links to issues 2012-07-25 21:11:58 +02:00
Riyad Preukschas cbce4528d0 Update links to commits 2012-07-25 21:11:58 +02:00
randx 14c9723724 Styled wiki area. fixed commit feed feature 2012-07-25 22:08:47 +03:00
randx 501ca8e6e8 Fix compare crash after decorator refactoring 2012-07-25 21:45:53 +03:00
randx 0296121f08 Remove recreated mailer controller for admin 2012-07-25 21:38:33 +03:00
randx 61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets 5133541f25 Merge pull request #1127 from riyad/use-decorators
Use CommitDecorator more
2012-07-25 11:25:55 -07:00
Dmitriy Zaporozhets 05848512bf Merge pull request #1133 from robbytaylor/master
Updated merge request subheading.
2012-07-25 11:22:03 -07:00
Dmitriy Zaporozhets 92d98f5a0c Merge pull request #1118 from patthoyts/pt/ldap-missing-password
Handle LDAP missing credentials error with a flash message.
2012-07-25 01:51:06 -07:00
Nihad Abbasov fbb41100db update help section with issues API docs 2012-07-24 05:52:43 -07:00
Rob Taylor dce6f7beb4 Updated merge request subheading.
Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.
2012-07-24 11:22:13 +01:00
Riyad Preukschas 34cea1cb63 Update views to use CommitDecorator 2012-07-22 13:08:24 +02:00
Riyad Preukschas ff40b7de7a Add CommitDecorator#short_id 2012-07-21 19:59:55 +02:00
Pat Thoyts a2d244ec06 Handle LDAP missing credentials error with a flash message.
If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.

The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit f322975.

This resolves issue #1077.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-21 09:04:05 +01:00
randx 11721b0dbe Help section for system hooks completed 2012-07-21 10:47:57 +03:00
randx 9c8a1e6517 Fix system hook example 2012-07-21 10:32:42 +03:00
randx 4261acda90 move SSH keys tab closer to begining 2012-07-21 10:27:09 +03:00
randx a69fc5dd23 Endless event loading for dsahboard 2012-07-21 10:23:05 +03:00
Pat Thoyts 787e5e94ac Fix english on the edit user form.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-20 22:18:42 +01:00
Ian Morgan 04a85f4582 Show wiki comments for all revisions 2012-07-20 13:16:19 -04:00
Dmitriy Zaporozhets 9267cb04b0 Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq 2012-07-20 14:24:56 +00:00
Dmitriy Zaporozhets 791208431c Box shadow for boxes 2012-07-20 08:39:34 +03:00
Dmitriy Zaporozhets 3c6daec4b1 Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq 2012-07-20 09:08:16 +00:00
Dmitriy Zaporozhets 3063af5adc BaseContext
Controllers refactoring with contexts
Move commit compare logic to model
2012-07-20 08:39:34 +03:00
Ian Morgan 36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
Valeriy Sizov d9cd6269e9 System Hooks: move callback to observer 2012-07-20 01:01:29 +03:00
gliptak 44ec5579bd Display configured git repository location on error page (this is partially addressing issue #1072) 2012-07-19 12:39:02 -03:00
Dmitriy Zaporozhets 1464952597 Fix comments in MR. Fixed event destroy with user 2012-07-19 07:05:57 +03:00
Valeriy Sizov 86bd11cbd8 System Hooks: rspec 2012-07-19 00:25:10 +03:00
Valeriy Sizov 655418bed2 System hooks: fix broken tests 2012-07-19 00:25:10 +03:00
Valeriy Sizov f5908cef19 System Hook: implemented 2012-07-19 00:25:10 +03:00
Valeriy Sizov c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Valeriy Sizov 65dc68b35c Refactoring of hook functionality & bootsrap system hooks 2012-07-19 00:25:10 +03:00
Valeriy Sizov 72a571724d Merge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project
show flash notice after deletion of a project
2012-07-18 05:35:42 -07:00
Valeriy Sizov 3ac840ff06 Merge pull request #1100 from patthoyts/pt/ldap-no-email
Improve handling of misconfigured LDAP accounts.
2012-07-18 05:17:14 -07:00
Dmitriy Zaporozhets 8803350023 CHANGELOG updated. Fixed MR bug. Logger improved 2012-07-17 08:23:16 +03:00
Dmitriy Zaporozhets 494cd02b38 Colored labels for events on dashboard 2012-07-17 08:21:16 +03:00
Dmitriy Zaporozhets a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
Dmitriy Zaporozhets 80f2ef2d02 MR index pollished 2012-07-17 08:17:16 +03:00
Pat Thoyts f322975c50 Improve handling of misconfigured LDAP accounts.
Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-16 23:31:28 +01:00
moregeek 990b9217d9 show flash notice after deletion of a project 2012-07-16 14:01:32 +02:00
Dmitriy Zaporozhets 2a705c4f40 Admin logs improved. Commits list box styled 2012-07-16 08:03:10 +03:00
Dmitriy Zaporozhets f88a2617e6 Tree ajax log. progress bar & refactoring 2012-07-10 23:12:38 +03:00
randx 1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
randx b8425cf173 Last push widget improved 2012-07-10 21:26:41 +03:00
randx d3862c0e57 CSS improvements & refactoring 2012-07-10 20:16:23 +03:00
Dmitriy Zaporozhets 1dca367f22 Merge pull request #1067 from SaitoWu/bugfix/encoding
fix blame encoding error.
2012-07-10 01:08:31 -07:00
Saito c5b16f0998 fix blame encoding error. 2012-07-10 15:57:43 +08:00
Staicu Ionut ba7b85d0d9 issues counter are now live updated on creation/deleteion/reopening
buttons on forms are disabled on submit (re-enabled after the request is complete)
2012-07-10 07:33:04 +03:00
randx be1b40802d Api page in help 2012-07-06 03:05:12 +03:00
randx 6451e837bf Better event feed for dashboard 2012-07-06 02:16:41 +03:00
Dmitriy Zaporozhets 4c24cabf47 Merge pull request #1012 from NARKOZ/devise
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
2012-07-06 08:18:18 -07:00
Nihad Abbasov 6533711825 enable lockable strategy for users 2012-07-06 00:05:31 -07:00
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets 9497b1a76e Compare images 2012-07-05 23:19:37 +03:00
Dmitriy Zaporozhets 31bc2b9495 Fix tree css class conflict 2012-07-06 16:42:13 +03:00
Dmitriy Zaporozhets 0a6b64e6a9 MR: Handle broken diff ex. in case its too huge 2012-07-05 22:59:37 +03:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
randx 369df86e71 Remove GITLAB_OPTS, fixed ldap user creation 2012-07-05 21:29:37 +03:00
Dmitriy Zaporozhets df6a75d52d buttons margin fixed 2012-07-05 09:35:23 +03:00
Dmitriy Zaporozhets 4e0c2f00d3 Merge pull request #1026 from gitlabhq/inline_diff
Inline diff
2012-07-04 22:45:52 -07:00
randx 264ee0c5a1 Tabs styled. MR Get Patch 2012-07-05 01:26:23 +03:00
Dmitriy Zaporozhets 031ae7756e Refactored navigation 2012-07-03 20:52:48 +03:00
Dmitriy Zaporozhets 51f174b97f fix port issue 2012-07-03 18:52:48 +03:00
Valeriy Sizov cecdb0b384 InlineDiff: refactoring 2012-07-02 23:34:25 +03:00
Valeriy Sizov a09558921b InlineDiff: base implementation 2012-07-02 23:08:07 +03:00
randx 1d543e6430 Finished with configs 2012-07-02 21:59:48 +03:00
Dmitriy Zaporozhets a2eda66b30 Disable issues sort. Recent issues on top. Fixed tests 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00