summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Tests updatePhil Hughes2016-09-133-2/+4
* Fixed searchPhil Hughes2016-09-131-6/+15
* Fixed issue with invited users not showing upPhil Hughes2016-09-133-8/+19
* Fixed members errorPhil Hughes2016-09-132-3/+3
* Return 403 if user can't update groupPhil Hughes2016-09-131-0/+1
* Removes row from dom when deletingPhil Hughes2016-09-136-26/+27
* Mobile spacing improvementsPhil Hughes2016-09-135-20/+41
* Removed console logPhil Hughes2016-09-132-2/+1
* Mobile improvementsPhil Hughes2016-09-137-24/+74
* Fixed group members not deletingPhil Hughes2016-09-134-9/+14
* Fixed issue with groups not displayingPhil Hughes2016-09-132-18/+2
* Included groups on project_members pagePhil Hughes2016-09-1312-57/+107
* Updates the member row when values changedPhil Hughes2016-09-133-6/+11
* Updated members UIPhil Hughes2016-09-139-79/+111
* Merge branch 'rails-5-backports' into 'master' Robert Speicher2016-09-121-1/+1
|\
| * Fix two problematic bits of code that will be deprecated or broken in Rails 5.Connor Shea2016-09-051-1/+1
* | Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ...Rémy Coutable2016-09-123-9/+6
|\ \
| * | Simplify a condition in Repository#update_fileRémy Coutable2016-09-121-1/+1
| * | fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-093-9/+6
* | | Merge branch 'issue_21825' into 'master' Rémy Coutable2016-09-121-0/+11
|\ \ \
| * | | Add information about user and manual build start to runner as variablesSergey Gnuskov2016-09-091-0/+11
* | | | Merge branch 'slightly-more-readable' into 'master' Rémy Coutable2016-09-121-3/+3
|\ \ \ \
| * | | | Make the cases clear instead of having guardsslightly-more-readableLin Jen-Shin2016-09-121-3/+3
* | | | | Merge branch 'sh-defer-resolvable-check' into 'master' Yorick Peterse2016-09-121-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-checkStan Hu2016-09-121-1/+2
| | |/ / | |/| |
* | | | Merge branch '21814-fix' into 'master' Robert Speicher2016-09-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Pull import sources from Gitlab::ImportSourcesOjas Shirekar2016-09-091-1/+1
* | | | Merge branch 'enable-pipeline-events-by-default' into 'master' Robert Speicher2016-09-091-0/+1
|\ \ \ \
| * | | | Enable pipeline events by defaultenable-pipeline-events-by-defaultLin Jen-Shin2016-09-091-0/+1
| |/ / /
* | | | Merge branch 'add-remember-option-u2f' into 'master' Robert Speicher2016-09-093-2/+4
|\ \ \ \
| * | | | Pass the remember_me option into the u2f form and support it while authentica...add-remember-option-u2fDJ Mountney2016-09-013-2/+4
* | | | | Merge branch 'branches-mr-button-permissions' into 'master' Robert Speicher2016-09-091-2/+3
|\ \ \ \ \
| * | | | | Hides merge request button on branches pagebranches-mr-button-permissionsPhil Hughes2016-09-021-2/+3
* | | | | | Merge branch '20300-restore-comments' into 'master' Jacob Schatz2016-09-0975-62/+757
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Require comments must be included before codeJared Deckard2016-09-081-3/+0
| * | | | | Restore comments lost when converting CoffeeScript to JavaScriptJared Deckard2016-09-0875-62/+760
| | |_|/ / | |/| | |
* | | | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-094-8/+14
|\ \ \ \ \
| * | | | | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-054-8/+14
* | | | | | Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' into...Rémy Coutable2016-09-092-0/+22
|\ \ \ \ \ \
| * | | | | | Refresh todos count cache when an Issue/MR is deletedDouglas Barbosa Alexandre2016-09-082-0/+22
* | | | | | | Merge branch 'sidekiq-ps-parsing' into 'master' Rémy Coutable2016-09-092-6/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove original regexpPascal Betz2016-09-081-9/+7
| * | | | | | Reformat Regexp Pascal Betz2016-09-082-3/+13
| * | | | | | feedback code reviewPascal Betz2016-09-082-2/+2
| * | | | | | Move parsing of sidekiq ps into helperPascal Betz2016-09-072-8/+15
* | | | | | | Merge branch 'support-long-branch-namers' into 'master' Annabel Dunstone Gray2016-09-081-3/+9
|\ \ \ \ \ \ \
| * | | | | | | Give project selection dropdowns responsive width, long-names wrap.support-long-branch-namersBryce2016-09-021-3/+9
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-082-1/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Just use string interpolation, feedback:Lin Jen-Shin2016-09-071-2/+1
| * | | | | | Show how long this pipeline was queuedLin Jen-Shin2016-09-052-0/+10