summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadl...Dmitriy Zaporozhets2016-01-131-1/+4
|\
| * Include user_username in user_(add_to/remove_from)_(project/group) system hooks.Tommy Beadle2016-01-071-0/+2
| * Include the username in user_create/destroy system hooks.Tommy Beadle2016-01-071-1/+2
* | Merge pull request #9952 from tbeadle/user_id_in_member_system_hookDmitriy Zaporozhets2016-01-131-0/+1
|\ \
| * | Include the user_id in user_*_team system hooks.Tommy Beadle2016-01-061-0/+1
| |/
* | Mention channel/key bug in irkerd docsLandon2016-01-121-3/+4
* | Merge branch 'change_milestone_close_copy' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
|\ \
| * | Revert group milestone copychange_milestone_close_copyJosh Frye2016-01-121-1/+1
| * | Change milestone close notice copy. Closes #6051Josh Frye2016-01-112-2/+2
* | | Merge branch 'improve_more_buttons' into 'master' Jacob Schatz2016-01-123-4/+4
|\ \ \
| * | | Improve admin area button styleDrew Blessing2016-01-113-4/+4
* | | | Merge branch 'show-ip-addresses' into 'master' Dmitriy Zaporozhets2016-01-121-0/+16
|\ \ \ \
| * | | | Add user's last used IP addresses to admin pageStan Hu2016-01-121-0/+16
* | | | | Merge branch 'improve_button_styles' into 'master' Dmitriy Zaporozhets2016-01-123-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve button stylesDrew Blessing2016-01-083-4/+4
* | | | | Merge branch 'hover-descriptions' into 'master' Dmitriy Zaporozhets2016-01-121-5/+9
|\ \ \ \ \
| * | | | | adds hover titles to merge request and issue pageshover-descriptionsJacob Schatz2016-01-111-5/+9
* | | | | | Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' Dmitriy Zaporozhets2016-01-121-3/+2
|\ \ \ \ \ \
| * | | | | | changes bolded on active for dropdowns, sitewide.active-state-on-button-makes-it-uppercaseJacob Schatz2016-01-111-3/+2
* | | | | | | Merge branch 'rs-add-title-to-emoji' into 'master' Dmitriy Zaporozhets2016-01-121-3/+6
|\ \ \ \ \ \ \
| * | | | | | | Add title attribute to Emojis in award pickerrs-add-title-to-emojiRobert Speicher2016-01-111-3/+6
* | | | | | | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-112-5/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-112-5/+7
* | | | | | | Merge branch 'fix-ci-builds-for-tags' into 'master' Robert Speicher2016-01-111-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Generate builds when creating tag using web interfacefix-ci-builds-for-tagsKamil Trzcinski2016-01-111-0/+1
* | | | | | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-116-7/+12
|\ \ \ \ \ \ \
| * | | | | | | Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-072-2/+4
| * | | | | | | Drop projects order in IssuableFinderYorick Peterse2016-01-071-2/+2
| * | | | | | | Don't pluck IDs when getting issues/MRs per groupYorick Peterse2016-01-072-2/+2
| * | | | | | | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-073-3/+6
* | | | | | | | Merge branch 'rs-woff-fonts' into 'master' Dmitriy Zaporozhets2016-01-1132-7/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Use WOFF versions of SourceSansPrors-woff-fontsRobert Speicher2016-01-0932-7/+8
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-113-107/+105
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-113-107/+105
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-083-107/+105
| | |/ / / / / /
* | | | | | | | Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erbDouwe Maan2016-01-113-22/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | use JavaScript instead of CoffeeScript in Views, the reason #9819Jason Lee2016-01-113-22/+24
* | | | | | | | Merge branch 'fix-build-status-caching' into 'master' Dmitriy Zaporozhets2016-01-111-5/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix caching issue where build status was not updating in project dashboardStan Hu2016-01-081-5/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'load-autocomplete-when-needed' into 'master' Dmitriy Zaporozhets2016-01-112-12/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Only load autocomplete data when actually neededYorick Peterse2016-01-112-12/+15
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-build-page-typo' into 'master' Kamil Trzciński2016-01-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix typo in build page of projectsSteffen Köhler2016-01-101-1/+1
* | | | | | | | Merge branch 'autocomplete-on-load' into 'master' Dmitriy Zaporozhets2016-01-111-13/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Load autocomplete data when loading an issue pageautocomplete-on-loadYorick Peterse2016-01-081-13/+12
* | | | | | | | | Merge branch 'new-branch-position-fix' into 'master' Dmitriy Zaporozhets2016-01-112-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixes new branch button positioning, when visible and not visible containernew-branch-position-fixJacob Schatz2016-01-082-2/+7
| |/ / / / / / / /
* | | | | | | | | Merge branch 'add-pencil-icon-to-group-page' into 'master' Dmitriy Zaporozhets2016-01-111-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check for current userStan Hu2016-01-101-1/+2
View Lorry Controller Status