summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master'"revert-b7c5ca49Alfredo Sumaran2017-02-1014-167/+29
* Merge branch '27963-tooltips-jobs' into 'master' Annabel Dunstone Gray2017-02-103-5/+15
|\
| * Fix broken test to use trigger in order to not take tooltip overlaping in con...Filipa Lacerda2017-02-101-1/+1
| * Merge branch 'master' into 27963-tooltips-jobsFilipa Lacerda2017-02-1020-21/+160
| |\
| * \ Merge branch 'master' into 27963-tooltips-jobs27963-tooltips-jobsFilipa Lacerda2017-02-102-3/+24
| |\ \
| * | | Fix tooltip scss for anchors.Filipa Lacerda2017-02-102-4/+14
* | | | Merge branch 'fix-job-to-pipeline-renaming' into 'master'Douwe Maan2017-02-105-7/+11
|\ \ \ \
| * | | | Fix job to pipeline renamingFilipa Lacerda2017-02-105-7/+11
* | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' Alfredo Sumaran2017-02-1014-29/+167
|\ \ \ \ \
| * | | | | Make sure events have most properties definedAlfredo Sumaran2017-02-105-28/+137
| * | | | | Restore exposure of legend property for eventsAlfredo Sumaran2017-02-109-1/+30
* | | | | | Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-1011-76/+54
|\ \ \ \ \ \
| * | | | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-1011-76/+54
* | | | | | | Merge branch 'issue-newproj-layout' into 'master' Rémy Coutable2017-02-103-7/+13
|\ \ \ \ \ \ \
| * | | | | | | Removed duplicate "Visibility Level" label on New Project pageRobert Marcano2017-02-093-7/+13
* | | | | | | | Merge branch '1051-api-create-users-without-password' into 'master' Rémy Coutable2017-02-104-4/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Optionally make users created via the API set their passwordJoost Rijneveld2017-02-094-4/+33
* | | | | | | | | Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' Kamil Trzciński2017-02-103-0/+22
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-pageLuke "Jared" Bennett2017-02-103-0/+22
* | | | | | | | | Merge branch 'sh-add-index-to-ci-trigger-requests' into 'master' Yorick Peterse2017-02-103-1/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add index to ci_trigger_requests for commit_idsh-add-index-to-ci-trigger-requestsStan Hu2017-02-103-1/+18
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' Dmitriy Zaporozhets2017-02-108-5/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-108-5/+107
* | | | | | | | | | Merge branch '27991-success-with-warnings-caret' into 'master' Alfredo Sumaran2017-02-102-7/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Remove orange caret icon from mr widget27991-success-with-warnings-caretAnnabel Dunstone Gray2017-02-102-7/+4
* | | | | | | | | | Merge branch 'rspec-profiling-branch-name-in-ci' into 'master' Rémy Coutable2017-02-101-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rspec_profiling: Discover the correct branch name in GitLab CINick Thomas2017-02-101-0/+8
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'protected-branches-doc-update' into 'master' Sean Packham (GitLab)2017-02-101-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated protected branches dropdown image in docsprotected-branches-doc-updatePhil Hughes2017-02-101-0/+0
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'user-dropdown-settings' into 'master' Alfredo Sumaran2017-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Make min width smaller for user settingsuser-dropdown-settingsAnnabel Dunstone Gray2017-02-091-1/+1
* | | | | | | | | | Merge branch 'issue_27855' into 'master' Rémy Coutable2017-02-101-5/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix admin_labels_spec.rb transient failureissue_27855Felipe Artur2017-02-101-5/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '27955-mr-notification-use-pipeline-language' into 'master' Filipa Lacerda2017-02-102-2/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 27955-mr-notification-use-pipeline-languageFilipa Lacerda2017-02-105-9/+31
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into 27955-mr-notification-use-pipeline-language27955-mr-notification-use-pipeline-languageFilipa Lacerda2017-02-104-4/+4
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Show Pipeline(not Job) in MR desktop notificationEric Eastwood2017-02-102-2/+6
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'test-for-current-gitlab-ci-yml' into 'master' Rémy Coutable2017-02-101-0/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make sure our current .gitlab-ci.yml is validtest-for-current-gitlab-ci-ymlLin Jen-Shin2017-02-101-0/+10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rs-issue-27974' into 'master'Rémy Coutable2017-02-102-3/+24
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Remove a transient failure from spec/requests/api/groups_spec.rbrs-issue-27974Robert Speicher2017-02-092-3/+24
* | | | | | | | | Merge branch 'jej-update-mr-state-event-docs' into 'master'Sean McGivern2017-02-102-5/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update MergeRequest API state_event option documentationjej-update-mr-state-event-docsJames Edwards-Jones2017-02-092-5/+6
* | | | | | | | | | Merge branch 'dz-patch-1' into 'master' Dmitriy Zaporozhets2017-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Update PROCESS.mddz-patch-1Dmitriy Zaporozhets2017-02-091-1/+1
* | | | | | | | | | Merge branch 'zj-rename-issuable-issue-base' into 'master'Rémy Coutable2017-02-104-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Rename issuable to IssueBasezj-rename-issuable-issue-baseZ.J. van de Weg2017-02-084-4/+4
* | | | | | | | | | Merge branch 'protected-branch-dropdown-titles' into 'master' Jacob Schatz2017-02-103-4/+20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Added header to protected branches access dropdownsprotected-branch-dropdown-titlesPhil Hughes2017-01-263-4/+20
* | | | | | | | | | Merge branch 'copy-branch-to-clipboard' into 'master' Filipa Lacerda2017-02-092-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |