summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 27932-merge-request-pipelines-displays-json27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1029-245/+125
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' " Fix broken test to use trigger in order to not take tooltip overlaping in consideration Fix job to pipeline renaming Replace teaspoon references with Karma Add changelog Only show MR widget graph if there are stages Fix tooltip scss for anchors. Adds css for button's tooltips to have similar behavior. Removes padding from mini graph table cell to guarantee stages don't break line on hover moved hyperlink reference section at the end of the content adds changelog fixes frontend doc broken link
| * Merge branch '27987-skipped-pipeline-mr-graph' into 'master' Alfredo Sumaran2017-02-102-2/+7
| |\ | | | | | | | | | | | | | | | | | | Only show MR widget graph if there are stages Closes #27987 See merge request !9141
| | * Add changelog27987-skipped-pipeline-mr-graphAnnabel Dunstone Gray2017-02-101-0/+4
| | |
| | * Only show MR widget graph if there are stagesAnnabel Dunstone Gray2017-02-101-2/+3
| | |
| * | Merge branch 'replace-teaspoon-references' into 'master' Clement Ho2017-02-104-22/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace teaspoon references with Karma Closes gitlab-com/gitlab-docs#68 See merge request !9011
| | * | Replace teaspoon references with Karmareplace-teaspoon-referencesClement Ho2017-02-104-22/+15
| | | |
| * | | Merge branch '27783-fix-fe-doc-broken-link' into 'master' Filipa Lacerda2017-02-102-42/+48
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes frontend doc broken link Closes #27783 See merge request !9120
| | * \ \ Merge branch 'master' into 27783-fix-fe-doc-broken-link27783-fix-fe-doc-broken-linkFilipa Lacerda2017-02-1013-20/+57
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix admin_labels_spec.rb transient failure Make sure our current .gitlab-ci.yml is valid Show Pipeline(not Job) in MR desktop notification Remove a transient failure from spec/requests/api/groups_spec.rb Update PROCESS.md Update MergeRequest API state_event option documentation Rename issuable to IssueBase
| | * | | moved hyperlink reference section at the end of the contentNur Rony2017-02-101-41/+43
| | | | |
| | * | | adds changelogNur Rony2017-02-101-0/+4
| | | | |
| | * | | fixes frontend doc broken linkNur Rony2017-02-101-1/+1
| | | | |
| * | | | Merge branch 'revert-changes-from-9126' into 'master' Alfredo Sumaran2017-02-1014-167/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master'" See merge request !9152
| | * | | | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' "Alfredo Sumaran2017-02-1014-167/+29
| |/ / / / | | | | | | | | | | | | | | | | | | | | This reverts commit b7c5ca499d9c26494736d92505116bbb294c63d6, reversing changes made to 9745c98bb77a1a1ddd964f58cc4d058a665eb9ee.
| * | | | Merge branch '27963-tooltips-jobs' into 'master' Annabel Dunstone Gray2017-02-103-5/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltips in mini pipeline graph Closes #27963 and #28008 See merge request !9140
| | * | | | Fix broken test to use trigger in order to not take tooltip overlaping in ↵Filipa Lacerda2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | consideration
| | * | | | Merge branch 'master' into 27963-tooltips-jobsFilipa Lacerda2017-02-1020-21/+160
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove orange caret icon from mr widget Add index to ci_trigger_requests for commit_id rspec_profiling: Discover the correct branch name in GitLab CI Show parent group members for nested group Updated protected branches dropdown image in docs Fix admin_labels_spec.rb transient failure Make sure our current .gitlab-ci.yml is valid Show Pipeline(not Job) in MR desktop notification Make min width smaller for user settings
| | * \ \ \ \ Merge branch 'master' into 27963-tooltips-jobs27963-tooltips-jobsFilipa Lacerda2017-02-102-3/+24
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove a transient failure from spec/requests/api/groups_spec.rb
| | * | | | | | Fix tooltip scss for anchors.Filipa Lacerda2017-02-102-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds css for button's tooltips to have similar behavior. Removes padding from mini graph table cell to guarantee stages don't break line on hover
| * | | | | | | Merge branch 'fix-job-to-pipeline-renaming' into 'master'Douwe Maan2017-02-105-7/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix job to pipeline renaming Closes #28016 See merge request !9147
| | * | | | | | | Fix job to pipeline renamingFilipa Lacerda2017-02-105-7/+11
| | | | | | | | |
* | | | | | | | | Adds verification in case the endpoint already has `.json`Filipa Lacerda2017-02-102-2/+20
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1048-129/+418
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Added env external link and light web terminal spec Don't perform Devise trackable updates on blocked User records Remove orange caret icon from mr widget Add index to ci_trigger_requests for commit_id Show parent group members for nested group Make sure events have most properties defined Restore exposure of legend property for events Optionally make users created via the API set their password Removed duplicate "Visibility Level" label on New Project page
| * | | | | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' Alfredo Sumaran2017-02-1014-29/+167
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small improvements for Cycle Analytics See merge request !9126
| | * | | | | | | | 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 records Closes #27519 See merge request !8915
| | * | | | | | | | 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 page See merge request !8272
| | * | | | | | | | 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 password Closes #1051 See merge request !8957
| | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add environment URL link to terminal page" Closes #27336 See merge request !9107
| | * | | | | | | | | 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_id See merge request !9124
| | * | | | | | | | | | Add index to ci_trigger_requests for commit_idsh-add-index-to-ci-trigger-requestsStan Hu2017-02-103-1/+18
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/pipelines.json makes a number of unindexed slow queries. This index should speed things up.
| * | | | | | | | | | Merge branch 'dz-nested-groups-members-page' into 'master' Dmitriy Zaporozhets2017-02-108-5/+107
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nested groups members page See merge request !9062
| | * | | | | | | | | | Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-108-5/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Merge branch '27991-success-with-warnings-caret' into 'master' Alfredo Sumaran2017-02-102-7/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove orange caret icon from MR widget Closes #27991 See merge request !9137
| | * | | | | | | | | | Remove orange caret icon from mr widget27991-success-with-warnings-caretAnnabel Dunstone Gray2017-02-102-7/+4
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-107-8/+31
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: rspec_profiling: Discover the correct branch name in GitLab CI Updated protected branches dropdown image in docs Fix admin_labels_spec.rb transient failure Make sure our current .gitlab-ci.yml is valid Show Pipeline(not Job) in MR desktop notification Make min width smaller for user settings
| * | | | | | | | | | 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 CI See merge request !9134
| | * | | | | | | | | | 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 docs See merge request !9138
| | * | | | | | | | | | 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 settings See merge request !9112
| | * | | | | | | | | 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 failure Closes #27855 See merge request !9135
| | * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Pipeline(not Job) in MR CI status desktop notification Closes #27955 See merge request !9122
| | * | | | | | | | | Merge branch 'master' into 27955-mr-notification-use-pipeline-languageFilipa Lacerda2017-02-105-9/+31
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Remove a transient failure from spec/requests/api/groups_spec.rb Update PROCESS.md Update MergeRequest API state_event option documentation