summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow scrolling within grouped pipelinesgrouped-builds-arrowAnnabel Dunstone Gray2016-10-112-6/+11
|
* Fix overflow to show grouped builds arrowAnnabel Dunstone Gray2016-10-111-1/+0
|
* Merge branch 'docs/refactor-monitoring' into 'master' Achilleas Pipinellis2016-10-1121-575/+585
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move monitoring/ to new location ## What does this MR do? Move monitoring/ to new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6518
| * Add links to internal docs in Metrics section in the admin areadocs/refactor-monitoringAchilleas Pipinellis2016-09-251-1/+5
| |
| * Move monitoring/ to new locationAchilleas Pipinellis2016-09-2520-574/+580
| |
* | Merge branch 'docs/refactor-reply-by-email' into 'master' Achilleas Pipinellis2016-10-119-630/+635
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move reply by email docs to a new location ## What does this MR do? Move reply by email docs to a new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6517
| * | Move reply by email docs to a new locationdocs/refactor-reply-by-emailAchilleas Pipinellis2016-09-259-630/+635
| |/ | | | | | | [ci skip]
* | Merge branch '21604-pipeline-ui-updates' into 'master' Fatih Acet2016-10-1110-119/+198
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipeline graph styles to match mockup #### What does this MR do? * Updates CSS for pipeline graph to match mockup * Adds JS to dynamically change line widths based on number of builds #### Screenshots (if relevant) ![Screen_Shot_2016-10-04_at_2.06.24_PM](/uploads/362378ca23e18a3cc59185eafab9f9ac/Screen_Shot_2016-10-04_at_2.06.24_PM.png) #### What are the relevant issue numbers? Closes #21604 See merge request !6320
| * | changed the scss for the top line connectors to be exactly centered21604-pipeline-ui-updatesDimitrie Hoekstra2016-10-111-3/+3
| | |
| * | Remove negative marginsAnnabel Dunstone Gray2016-10-101-5/+3
| | |
| * | slight update to lines and curves positioningDimitrie Hoekstra2016-10-101-3/+5
| | |
| * | JS review changes and fixed conflictsLuke Bennett2016-10-101-1/+1
| | |
| * | Corrected my correction for turbolinks -.-'Luke Bennett2016-10-102-4/+1
| | | | | | | | | | | | Removed extra cell on generic pipeline
| * | Fix node flex alignmentAnnabel Dunstone Gray2016-10-101-2/+2
| | |
| * | JS review changes - Removed window from window.gl in dispatcherLuke Bennett2016-10-105-3/+8
| | | | | | | | | | | | | | | | | | Added page:load event as ready isnt fired by turbolinks Fix dropdown menu link click registration
| * | Fix ul htmlAnnabel Dunstone Gray2016-10-102-3/+3
| | |
| * | Move hidden class to graph itself; remove background color from play node & ↵Annabel Dunstone Gray2016-10-103-6/+5
| | | | | | | | | | | | align icon
| * | Finished up margin JS logicLuke Bennett2016-10-104-67/+79
| | |
| * | Added final changes from handoverLuke Bennett2016-10-104-26/+36
| | |
| * | Change size of pipeline status icons and dropdownsAnnabel Dunstone Gray2016-10-104-21/+41
| | |
| * | Change length of connecting lines based on number of buildsAnnabel Dunstone Gray2016-10-102-6/+27
| | |
| * | Update pipeline graph styles to match mockupAnnabel Dunstone Gray2016-10-102-15/+30
| | |
* | | Merge branch 'tmatesoft/gitlab-ce-migrate-from-svn-doc-update' into 'master' Achilleas Pipinellis2016-10-111-2/+106
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add SubGit to the tools of SVN migration Originally from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6549. See merge request !6803
| * | | Refactor the SubGit/SVN documentationAchilleas Pipinellis2016-10-111-40/+52
| | | | | | | | | | | | | | | | [ci skip]
| * | | Update migrating_from_svn.md document on migration from SVN to GitLab as ↵TMate Software Support2016-10-101-23/+29
| | | | | | | | | | | | | | | | suggested by @axil in MR 6549.
| * | | Update migrating_from_svn.md TMate Software Support2016-09-271-3/+89
| | | | | | | | | | | | Documentation updated to cover Git/SVN mirror approach to migration from SVN to GitLab.
* | | | Merge branch 'document-ci-shell-trace-variable' into 'master' Achilleas Pipinellis2016-10-112-0/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the new CI_DEBUG_TRACE variable a feature that will be introduced in GitLab Runner v1.7 Related to https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/339 See merge request !6700
| * | | | Document the new CI_DEBUG_TRACE variableNick Thomas2016-10-112-0/+36
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'sh-fix-issue-20776' into 'master' Robert Speicher2016-10-113-1/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when viewing old merge requests with bad diff data Customers running old versions of GitLab may have MergeRequestDiffs with the text ["--broken diff"] due to text generated by gitlab_git 1.0.3. To avoid the Error 500, verify that each element is a type that gitlab_git will accept before attempting to create a DiffCollection. Closes #20776 See merge request !6754
| * | | | | Fix Error 500 when viewing old merge requests with bad diff datash-fix-issue-20776Stan Hu2016-10-103-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Customers running old versions of GitLab may have MergeRequestDiffs with the text ["--broken diff"] due to text generated by gitlab_git 1.0.3. To avoid the Error 500, verify that each element is a type that gitlab_git will accept before attempting to create a DiffCollection. Closes #20776
* | | | | | Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into ↵Robert Speicher2016-10-115-0/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add a new gitlab:users:clear_all_authentication_tokens task ## What are the relevant issue numbers? Part of #22537. See merge request !6745
| * | | | | | Add a safeguard in User#set_projects_limitnew-gitlab-users-clear_all_authentication_tokens-taskRémy Coutable2016-10-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Add a new gitlab:users:clear_all_authentication_tokens taskRémy Coutable2016-10-114-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'master' into 'master' Rémy Coutable2016-10-113-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mail_room gem ## What does this MR do? Upgrades the mail_room gem from 0.8.0 to 0.8.1. ## Why was this MR needed? mail_room throws an exception if the watching script joins a undefined thread. Release 0.8.1 adds a check to ensure that the thread exists before calling join. Fixes gitlab-org/omnibus-gitlab#1619. See merge request !6714
| * | | | | | | Update mail_room gemTjaart van der Walt2016-10-063-3/+4
| | | | | | | |
* | | | | | | | Merge branch 'gitlab-basics' into 'master' Achilleas Pipinellis2016-10-1121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant images from GitLab basics docs See merge request !6799
| * | | | | | | | Remove redundant imagesAchilleas Pipinellis2016-10-1121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'nahtnam/gitlab-ce-ci-test-phoenix' into 'master' Achilleas Pipinellis2016-10-113-0/+58
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an example for testing a phoenix application with Gitlab CI _Originally opened at !5074 by @nahtnam._ - - - ## What does this MR do? Add an example on how to setup testing on phoenix ## Are there points in the code the reviewer needs to double check? Grammar and formatting ## Why was this MR needed? https://twitter.com/gitlab/status/749898132008337408 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6794
| * | | | | | | | | Improve a bit the example .gitlab-ci.yml for Phoenixnahtnam/gitlab-ce-ci-test-phoenixRémy Coutable2016-10-111-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | Add an example for testing a phoenix application with Gitlab CI.Manthan Mallikarjun2016-10-113-0/+54
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'gitlab-basics' into 'master' Achilleas Pipinellis2016-10-1177-177/+149
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace images in GitLab basics docs See merge request !6786
| * | | | | | | | Rearrange GitLab basics READMEsAchilleas Pipinellis2016-10-112-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | New images for GitLab basics "Create MR" docsAchilleas Pipinellis2016-10-118-29/+20
| | | | | | | | |
| * | | | | | | | Add new images in GitLab basics "Create issue" docsAchilleas Pipinellis2016-10-119-15/+18
| | | | | | | | |
| * | | | | | | | Reference the web editor docs in GitLab basics "Add a file"Achilleas Pipinellis2016-10-111-25/+3
| | | | | | | | |
| * | | | | | | | New images for GitLab basics "Fork project" docsAchilleas Pipinellis2016-10-115-9/+10
| | | | | | | | |
| * | | | | | | | Reference the web editor docs in GitLab basics "Create a branch"Achilleas Pipinellis2016-10-113-37/+10
| | | | | | | | |
| * | | | | | | | New images for GitLab basics "Create group" docsAchilleas Pipinellis2016-10-119-23/+28
| | | | | | | | |
| * | | | | | | | Add new images for GitLab basics "create project"Achilleas Pipinellis2016-10-115-12/+15
| | | | | | | | |
| * | | | | | | | Use new image for gitlab-basics/command-line-commands.mdgitlab-basicsAchilleas Pipinellis2016-10-104-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
View Lorry Controller Status