Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master'"revert-b7c5ca49 | Alfredo Sumaran | 2017-02-10 | 14 | -167/+29 |
* | Merge branch '27963-tooltips-jobs' into 'master' | Annabel Dunstone Gray | 2017-02-10 | 3 | -5/+15 |
|\ | |||||
| * | Fix broken test to use trigger in order to not take tooltip overlaping in con... | Filipa Lacerda | 2017-02-10 | 1 | -1/+1 |
| * | Merge branch 'master' into 27963-tooltips-jobs | Filipa Lacerda | 2017-02-10 | 20 | -21/+160 |
| |\ | |||||
| * \ | Merge branch 'master' into 27963-tooltips-jobs27963-tooltips-jobs | Filipa Lacerda | 2017-02-10 | 2 | -3/+24 |
| |\ \ | |||||
| * | | | Fix tooltip scss for anchors. | Filipa Lacerda | 2017-02-10 | 2 | -4/+14 |
* | | | | Merge branch 'fix-job-to-pipeline-renaming' into 'master' | Douwe Maan | 2017-02-10 | 5 | -7/+11 |
|\ \ \ \ | |||||
| * | | | | Fix job to pipeline renaming | Filipa Lacerda | 2017-02-10 | 5 | -7/+11 |
* | | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' | Alfredo Sumaran | 2017-02-10 | 14 | -29/+167 |
|\ \ \ \ \ | |||||
| * | | | | | Make sure events have most properties defined | Alfredo Sumaran | 2017-02-10 | 5 | -28/+137 |
| * | | | | | Restore exposure of legend property for events | Alfredo Sumaran | 2017-02-10 | 9 | -1/+30 |
* | | | | | | Merge branch 'rs-warden-blocked-users' into 'master' | Robert Speicher | 2017-02-10 | 11 | -76/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-users | Robert Speicher | 2017-02-10 | 11 | -76/+54 |
* | | | | | | | Merge branch 'issue-newproj-layout' into 'master' | Rémy Coutable | 2017-02-10 | 3 | -7/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Removed duplicate "Visibility Level" label on New Project page | Robert Marcano | 2017-02-09 | 3 | -7/+13 |
* | | | | | | | | Merge branch '1051-api-create-users-without-password' into 'master' | Rémy Coutable | 2017-02-10 | 4 | -4/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Optionally make users created via the API set their password | Joost Rijneveld | 2017-02-09 | 4 | -4/+33 |
* | | | | | | | | | Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' | Kamil Trzciński | 2017-02-10 | 3 | -0/+22 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-page | Luke "Jared" Bennett | 2017-02-10 | 3 | -0/+22 |
* | | | | | | | | | Merge branch 'sh-add-index-to-ci-trigger-requests' into 'master' | Yorick Peterse | 2017-02-10 | 3 | -1/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add index to ci_trigger_requests for commit_idsh-add-index-to-ci-trigger-requests | Stan Hu | 2017-02-10 | 3 | -1/+18 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' | Dmitriy Zaporozhets | 2017-02-10 | 8 | -5/+107 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Show parent group members for nested groupdz-nested-groups-members-page | Dmitriy Zaporozhets | 2017-02-10 | 8 | -5/+107 |
* | | | | | | | | | | Merge branch '27991-success-with-warnings-caret' into 'master' | Alfredo Sumaran | 2017-02-10 | 2 | -7/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove orange caret icon from mr widget27991-success-with-warnings-caret | Annabel Dunstone Gray | 2017-02-10 | 2 | -7/+4 |
* | | | | | | | | | | Merge branch 'rspec-profiling-branch-name-in-ci' into 'master' | Rémy Coutable | 2017-02-10 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rspec_profiling: Discover the correct branch name in GitLab CI | Nick Thomas | 2017-02-10 | 1 | -0/+8 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'protected-branches-doc-update' into 'master' | Sean Packham (GitLab) | 2017-02-10 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Updated protected branches dropdown image in docsprotected-branches-doc-update | Phil Hughes | 2017-02-10 | 1 | -0/+0 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'user-dropdown-settings' into 'master' | Alfredo Sumaran | 2017-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Make min width smaller for user settingsuser-dropdown-settings | Annabel Dunstone Gray | 2017-02-09 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'issue_27855' into 'master' | Rémy Coutable | 2017-02-10 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix admin_labels_spec.rb transient failureissue_27855 | Felipe Artur | 2017-02-10 | 1 | -5/+6 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '27955-mr-notification-use-pipeline-language' into 'master' | Filipa Lacerda | 2017-02-10 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into 27955-mr-notification-use-pipeline-language | Filipa Lacerda | 2017-02-10 | 5 | -9/+31 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into 27955-mr-notification-use-pipeline-language27955-mr-notification-use-pipeline-language | Filipa Lacerda | 2017-02-10 | 4 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Show Pipeline(not Job) in MR desktop notification | Eric Eastwood | 2017-02-10 | 2 | -2/+6 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'test-for-current-gitlab-ci-yml' into 'master' | Rémy Coutable | 2017-02-10 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Make sure our current .gitlab-ci.yml is validtest-for-current-gitlab-ci-yml | Lin Jen-Shin | 2017-02-10 | 1 | -0/+10 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'rs-issue-27974' into 'master' | Rémy Coutable | 2017-02-10 | 2 | -3/+24 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove a transient failure from spec/requests/api/groups_spec.rbrs-issue-27974 | Robert Speicher | 2017-02-09 | 2 | -3/+24 |
* | | | | | | | | | Merge branch 'jej-update-mr-state-event-docs' into 'master' | Sean McGivern | 2017-02-10 | 2 | -5/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update MergeRequest API state_event option documentationjej-update-mr-state-event-docs | James Edwards-Jones | 2017-02-09 | 2 | -5/+6 |
* | | | | | | | | | | Merge branch 'dz-patch-1' into 'master' | Dmitriy Zaporozhets | 2017-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Update PROCESS.mddz-patch-1 | Dmitriy Zaporozhets | 2017-02-09 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'zj-rename-issuable-issue-base' into 'master' | Rémy Coutable | 2017-02-10 | 4 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Rename issuable to IssueBasezj-rename-issuable-issue-base | Z.J. van de Weg | 2017-02-08 | 4 | -4/+4 |
* | | | | | | | | | | Merge branch 'protected-branch-dropdown-titles' into 'master' | Jacob Schatz | 2017-02-10 | 3 | -4/+20 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Added header to protected branches access dropdownsprotected-branch-dropdown-titles | Phil Hughes | 2017-01-26 | 3 | -4/+20 |
* | | | | | | | | | | Merge branch 'copy-branch-to-clipboard' into 'master' | Filipa Lacerda | 2017-02-09 | 2 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | |