summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed backup.rake colorize method following Pages -> CEjej-fix-backup-rake-colorConnor Shea2017-02-071-6/+6
* Merge branch 'fix/import-group-members' into 'master' Rémy Coutable2017-02-0710-13/+124
|\
| * Add missing group members to export for I/Efix/import-group-membersJames Lopez2017-02-0710-13/+124
* | Merge branch 'docs/fix-broken-links' into 'master' Achilleas Pipinellis2017-02-0746-65/+60
|\ \
| * | Fix broken links to docsAchilleas Pipinellis2017-02-0646-65/+60
* | | Merge branch 'fix/grape-routes' into 'master' James Lopez2017-02-071-1/+5
|\ \ \
| * | | added missed commit in rebaseJames Lopez2017-02-071-3/+1
| * | | update Grape routes to work with current version of GrapeJames Lopez2017-02-071-1/+7
* | | | Merge branch 'issue_19262' into 'master' Sean McGivern2017-02-073-0/+44
|\ \ \ \
| * | | | Disallow system notes for closed issuablesissue_19262Felipe Artur2017-02-063-0/+44
* | | | | Merge branch '26920-hover-cursor-on-pagination-element' into 'master' Filipa Lacerda2017-02-072-0/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | adds changelog26920-hover-cursor-on-pagination-elementNur Rony2017-02-071-0/+4
| * | | | fixes cursor issue on pipeline paginationNur Rony2017-02-071-0/+14
* | | | | Merge branch '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipe...Kamil Trzciński2017-02-0723-63/+209
|\ \ \ \ \
| * | | | | Fixed variables_controller_spec.rb test26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pagesJose Ivan Vargas2017-02-061-2/+1
| * | | | | Updated the #create action to render the show view in case of a form errorJose Ivan Vargas2017-02-061-2/+2
| * | | | | Improved code styling on the variables_controller_specJose Ivan Vargas2017-02-063-12/+15
| * | | | | Added tests for the variables controller #update actionJose Ivan Vargas2017-02-062-3/+29
| * | | | | Added a variable_controller_spec test to test for flash messages on the #crea...Jose Ivan Vargas2017-02-062-0/+31
| * | | | | Modified redirection logic in the variables cont.Jose Ivan Vargas2017-02-061-2/+3
| * | | | | Added redirections to the index actions for the variables and triggers contro...Jose Ivan Vargas2017-02-062-0/+8
| * | | | | Added a flash message to the creation of triggersJose Ivan Vargas2017-02-061-2/+3
| * | | | | Fixed tests, renamed files and methodsJose Ivan Vargas2017-02-068-6/+28
| * | | | | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-0613-34/+53
| * | | | | Added private methods to initialize variables in the ci_cd_pipelines_controllerJose Ivan Vargas2017-02-062-5/+17
| * | | | | Corrected titles on the triggers and pipelines sectionsJose Ivan Vargas2017-02-063-3/+3
| * | | | | Corrected tests and changed trigger controller redirects to the ci_cd_pipelin...Jose Ivan Vargas2017-02-062-4/+3
| * | | | | Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-062-14/+22
| * | | | | Fixed badges testJose Ivan Vargas2017-02-061-1/+1
| * | | | | changed pipelines controller name to ci_cd_pipelinesJose Ivan Vargas2017-02-068-13/+13
| * | | | | Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-0612-41/+58
* | | | | | Merge branch 'stewardship-label' into 'master' Robert Schilling2017-02-071-0/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add the stewardship label to contributing.mdstewardship-labelJob van der Voort2017-02-061-0/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-0715-80/+265
|\ \ \ \ \
| * | | | | Use random group name to prevent conflictsDouwe Maan2017-02-061-1/+1
| * | | | | List all groups/projects for admins on explore pagesDouwe Maan2017-02-062-2/+14
| * | | | | Fix indentationee-1439-read-only-userDouwe Maan2017-02-061-4/+4
| * | | | | More backportDouwe Maan2017-02-065-36/+178
| * | | | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-064-8/+29
| * | | | | Backport UI changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-062-22/+23
| * | | | | Backport changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-063-21/+30
* | | | | | Merge branch '27343-autocomplete-post-to-wrong-url-when-not-hosting-in-root' ...Filipa Lacerda2017-02-075-11/+61
|\ \ \ \ \ \
| * | | | | | Fix filtered search user autocomplete for gitlab instances that are hosted on...27343-autocomplete-post-to-wrong-url-when-not-hosting-in-rootClement Ho2017-02-065-11/+61
* | | | | | | Merge branch 'commit-description-border' into 'master' Alfredo Sumaran2017-02-061-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove lighter colored commit description bordercommit-description-borderAnnabel Dunstone Gray2017-02-061-1/+0
| |/ / / / / /
* | | | | | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-0644-278/+1087
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into fe-commit-mr-pipelinesfe-commit-mr-pipelinesFilipa Lacerda2017-02-062-1/+13
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Use webpack to require filesFilipa Lacerda2017-02-0512-44/+43
| * | | | | | Use webpack to require filesFilipa Lacerda2017-02-059-32/+28
| * | | | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-053-3/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |