summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'disable-sticky-diffs' into 'master'Dmitriy Zaporozhets2015-07-063-9/+0
|\
| * Remove sticky-diff functionalitydisable-sticky-diffsDmitriy Zaporozhets2015-07-062-8/+0
| * Revert "Diff headers made sticky"Dmitriy Zaporozhets2015-07-061-1/+0
* | Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-0610-16/+90
|\ \
| * | Audit log for user authenticationValery Sizov2015-07-0610-16/+90
* | | Merge branch 'add-irker-options' into 'master'Dmitriy Zaporozhets2015-07-063-67/+49
|\ \ \
| * | | Add Irker service configuration optionsStan Hu2015-07-053-67/+49
* | | | Fix redirection to home page URL for unauthorized usersDaniel Gerhardt2015-07-031-1/+1
| |_|/ |/| |
* | | Merge branch 'add-unlock-access' into 'master'Dmitriy Zaporozhets2015-07-023-0/+18
|\ \ \
| * | | Add support for unlocking users in admin settingsStan Hu2015-07-023-0/+18
| |/ /
* | | 'created_at DESC' is performed twicecatatsuy2015-07-021-1/+1
* | | Merge branch 'anonymous-applications' into 'master'Dmitriy Zaporozhets2015-07-024-4/+24
|\ \ \
| * | | Correctly show anonymous authorized applications under Profile > Applications.Douwe Maan2015-07-024-4/+24
| |/ /
* | | Remove link leading to a 404 error in Deploy Keys pageStan Hu2015-07-011-2/+1
|/ /
* | Merge branch 'gfm-commit' into 'master'Robert Speicher2015-07-011-0/+4
|\ \ | |/ |/|
| * commit hashes are monospacedNicolás Reynolds2015-07-011-0/+4
* | Refactor can_be_merged logic for merge requestDmitriy Zaporozhets2015-07-012-7/+10
* | Merge branch 'use-rugged-for-merge' into 'master'Dmitriy Zaporozhets2015-07-013-6/+56
|\ \
| * | Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets2015-07-013-6/+56
* | | fix of GitLab CI forkingValery Sizov2015-07-011-0/+1
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-012-3/+2
|\ \
| * \ Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-07-012-3/+2
| |\ \
| | * | Fix commits feed buttonDmitriy Zaporozhets2015-07-011-1/+1
| | * | Open big avatar when click on user imageDmitriy Zaporozhets2015-06-301-1/+1
| | * | Make commits atom feed button smallerDmitriy Zaporozhets2015-06-301-1/+0
| | |/
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-011-2/+4
|\ \ \ | |/ /
| * | Merge branch 'fix-zero-sha-lookup' into 'master'Dmitriy Zaporozhets2015-07-011-2/+4
| |\ \
| | * | Repository#blob_at should return nil for 00000000... shafix-zero-sha-lookupDmitriy Zaporozhets2015-07-011-2/+4
* | | | Merge branch 'group_settings_nav' into 'master'Douwe Maan2015-07-019-34/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-249-34/+35
* | | | Merge branch 'reporter-manage-issues' into 'master'Dmitriy Zaporozhets2015-07-011-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Reporter role can manage issue tracker nowreporter-manage-issuesDmitriy Zaporozhets2015-06-301-4/+4
* | | | Use to_reference menthod when render issue id in listDmitriy Zaporozhets2015-07-011-1/+1
* | | | Cache markdown of commentscache-commits-renderDmitriy Zaporozhets2015-06-301-4/+5
* | | | Cache issue in the listDmitriy Zaporozhets2015-06-301-36/+37
* | | | Cache commits listDmitriy Zaporozhets2015-06-301-28/+29
* | | | Re-use event cache with other users unless its personalDmitriy Zaporozhets2015-06-301-10/+11
| |_|/ |/| |
* | | Merge branch 'fix-relative-submodule-namespace-path' into 'master'Dmitriy Zaporozhets2015-06-291-1/+1
|\ \ \ | |/ / |/| |
| * | Fix Error 500 when relative submodule resolves to a namespace that has a diff...Stan Hu2015-06-231-1/+1
* | | Remove requires-input from the Network Graph formrs-disables-submit-behaviorRobert Speicher2015-06-261-2/+2
* | | Remove duplicate 'required: true' attributeRobert Speicher2015-06-261-1/+1
* | | Remove disableButtonIf[Any]EmptyField calls from formsRobert Speicher2015-06-2617-53/+26
* | | Add "Requires Input" JS behaviorRobert Speicher2015-06-261-0/+39
* | | Merge branch 'rename-abilities' into 'master'Dmitriy Zaporozhets2015-06-2627-77/+90
|\ \ \
| * | | Refactor issue, mr, note abilities to include project abilities tooDmitriy Zaporozhets2015-06-261-13/+30
| * | | Change dynamic abilities to new formatDmitriy Zaporozhets2015-06-262-13/+9
| * | | Update controller filtersDmitriy Zaporozhets2015-06-266-13/+13
| * | | Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-2625-42/+42
* | | | Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets2015-06-261-5/+11
|\ \ \ \
| * | | | Trigger sticky_kit:recalc when diffs are pre-loadedRobert Speicher2015-06-251-3/+9