summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '26238-buttons-not-accessible' into 'master' Annabel Dunstone Gray2017-01-092-2/+2
|\
| * Fix html in order to make items accessible through keyboard navigation26238-buttons-not-accessibleFilipa Lacerda2017-01-062-2/+2
* | Merge branch 'ryancharris/gitlab-ce-25277-milestone-counter-number-with-delim...Clement Ho2017-01-091-0/+1
|\ \
| * | Resolved merge conflict in app/views/shared/milestones/_issuables.html.hamlRyan Harris2017-01-071-0/+1
* | | Merge branch '26446-access-download-artifacts-via-keyboard' into 'master' Clement Ho2017-01-091-1/+1
|\ \ \
| * | | Made download artifacts button accessible via keyboardRyan Harris2017-01-081-1/+1
| |/ /
* | | Merge branch 'remove-successful-pipeline-emails-for-now' into 'master' Sean McGivern2017-01-092-1/+8
|\ \ \
| * | | Introduce EXCLUDED_WATCHER_EVENTS to exclude eventsremove-successful-pipeline-emails-for-nowLin Jen-Shin2017-01-052-2/+5
| * | | Make successful pipeline emails off for watchersLin Jen-Shin2017-01-051-1/+5
* | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-094-0/+23
|\ \ \ \
| * | | | Record and show last used date of SSH KeysVincent Wong2017-01-094-0/+23
* | | | | Merge branch 'fix-broken-url-on-group-avatar' into 'master' Sean McGivern2017-01-091-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix broken url on group avatarhogewest2017-01-061-1/+1
* | | | | Merge branch '25371-environments-date-created-column-is-not-labeled' into 'ma...Clement Ho2017-01-061-1/+1
|\ \ \ \ \
| * | | | | Add label to Environments "Date Created" columnSaad Shahd2016-12-301-1/+1
* | | | | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-0619-131/+160
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Moved the "import" button next to the "Add to project" button25985-combine-members-and-groups-settings-pagesJose Ivan Vargas2017-01-064-3/+6
| * | | | | Fixed a test and change the arrow functions to named functionsJose Ivan Vargas2017-01-041-2/+2
| * | | | | Added UX improvementsJose Ivan Vargas2017-01-032-23/+21
| * | | | | Fixed es6 lint errors, and reverted a change to a helperJose Ivan Vargas2017-01-034-9/+8
| * | | | | Updated the "users" to "members" matches in the viewJose Ivan Vargas2017-01-037-13/+12
| * | | | | Updated some tests descriptions to represent the correct settings pathJose Ivan Vargas2017-01-031-7/+3
| * | | | | Removed the "Groups" option from the settings gearJose Ivan Vargas2017-01-034-13/+10
| * | | | | Added groups to members section, added a members finderJose Ivan Vargas2017-01-037-20/+35
| * | | | | Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-032-2/+3
| * | | | | Fixed rspec tests for the project members also fixed the indexJose Ivan Vargas2017-01-033-48/+3
| * | | | | Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-0312-42/+108
* | | | | | Merge branch 'fixed-edit-form-failing-test' into 'master' Rémy Coutable2017-01-062-3/+4
|\ \ \ \ \ \
| * | | | | | Fixed edit form authenticity_token call failing the testsfixed-edit-form-failing-testPhil Hughes2017-01-062-3/+4
* | | | | | | Merge branch 'issue-boards-animate' into 'master' Fatih Acet2017-01-064-27/+59
|\ \ \ \ \ \ \
| * | | | | | | Added note about width of sidebarissue-boards-animatePhil Hughes2017-01-062-8/+13
| * | | | | | | Fixed issue card not scrolling to correct positionPhil Hughes2017-01-051-1/+7
| * | | | | | | Added animations to issue boardsPhil Hughes2017-01-034-23/+44
* | | | | | | | Merge branch 'speed-up-group-milestone-index' into 'master' Sean McGivern2017-01-067-30/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | Speed up group milestone index by passing group_id to IssuesFinderAdam Niedzielski2017-01-067-30/+66
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Whitelist next project names: assets, profile, publicDmitriy Zaporozhets2017-01-061-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'fix-timezone-due-date-picker' into 'master' Alfredo Sumaran2017-01-062-3/+6
|\ \ \ \ \ \ \
| * | | | | | | add comment to explain why we are avoiding the dateString constructor option ...fix-timezone-due-date-pickerMike Greiling2017-01-021-0/+1
| * | | | | | | make expected due_date value format explicitMike Greiling2017-01-021-1/+1
| * | | | | | | remove unnecessary utility functionMike Greiling2017-01-022-17/+3
| * | | | | | | remove unnecessary fixtures and testsMike Greiling2017-01-021-4/+2
| * | | | | | | fix eslint violationsMike Greiling2017-01-021-3/+3
| * | | | | | | Pass date as integer params on instantiate new Date in order to avoid time zo...giulianovarriale2017-01-022-3/+21
* | | | | | | | Merge branch '26352-user-dropdown-settings' into 'master' Annabel Dunstone Gray2017-01-053-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | 26352 Change Profile settings to User / Settings26352-user-dropdown-settingstauriedavis2017-01-043-4/+4
* | | | | | | | | Merge branch 'markdown-button-newline-bug-fix' into 'master' Fatih Acet2017-01-051-3/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed first newline not workingmarkdown-button-newline-bug-fixPhil Hughes2016-12-211-1/+12
| * | | | | | | | | Fixed new line being included in bold/italic in GFM formPhil Hughes2016-12-211-3/+22
* | | | | | | | | | Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available...Fatih Acet2017-01-054-51/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | include all expected instance vars for _show.html.haml template within tests26155-merge-request-tabs-don-t-render-when-no-commits-availableMike Greiling2017-01-031-1/+1
View Lorry Controller Status