summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | API methods should be documented using Grape's DSL document-grape-dslRémy Coutable2016-08-011-0/+6
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2397#note_13491048
* | | | | | | | | | Merge branch 'issue_20063_2' into 'master' Rémy Coutable2016-08-013-2/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix search results for notes without commits part of #20063 ![deleted_commit](/uploads/5d99b9aedaf4f728425d95f7a9734d98/deleted_commit.png) See merge request !5571
| * | | | | | | | | | Fix search results for notes without commitsFelipe Artur2016-08-013-2/+27
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'admin-builds' into 'master' Fatih Acet2016-08-013-14/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines/Builds updates ## What does this MR do? Adds branch/tag icons in admin view; increase min-width of builds tables ## What are the relevant issue numbers? #20139 ## Screenshots (if relevant) Branch icons: ![Screen_Shot_2016-07-27_at_1.29.57_PM](/uploads/2fceddfed5ed1a28d9b7d5e2427cba93/Screen_Shot_2016-07-27_at_1.29.57_PM.png) Reduce `icon-container` width, before: ![Screen_Shot_2016-07-27_at_5.29.32_PM](/uploads/e3fe38edc262f6460572e20102ef9b6d/Screen_Shot_2016-07-27_at_5.29.32_PM.png) Reduce `icon-container` width, after: ![Screen_Shot_2016-07-27_at_5.29.03_PM](/uploads/58b82e2c1491672c95dfe35911891891/Screen_Shot_2016-07-27_at_5.29.03_PM.png) See merge request !5527
| * | | | | | | | | Decrease icon container width to help fit all pipeline commit info on two linesadmin-buildsAnnabel Dunstone2016-07-281-1/+1
| | | | | | | | | |
| * | | | | | | | | Add icon containerAnnabel Dunstone2016-07-281-1/+2
| | | | | | | | | |
| * | | | | | | | | Adjust min-widths of pipelines and builds tablesAnnabel Dunstone2016-07-281-1/+5
| | | | | | | | | |
| * | | | | | | | | Add pipeline icon to admin builds; position warning icon after shaAnnabel Dunstone2016-07-282-11/+9
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/importing-io-timing-issue' into 'master' Rémy Coutable2016-08-011-1/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timing problems running imports on production Fixes https://gitlab.com/gitlab-com/infrastructure/issues/151 I've found out that in staging, the imported file is not copied fully by the time sidekiq runs the job, this should hopefully fix it. (Tested against staging). See merge request !5523
| * | | | | | | | | Update CHANGELOGJames Lopez2016-08-011-1/+0
| | | | | | | | | |
| * | | | | | | | | refactored wait_for_archived_file methodfix/importing-io-timing-issueJames Lopez2016-08-011-6/+4
| | | | | | | | | |
| * | | | | | | | | fix return value and specJames Lopez2016-08-011-1/+1
| | | | | | | | | |
| * | | | | | | | | squashed - fix timing issues in prod importing projectsJames Lopez2016-08-012-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added changelog fix specs refactored code based on feedback fix rubocop warning
* | | | | | | | | | Merge branch 'fix-gh-pull-requests' into 'master' Rémy Coutable2016-08-013-5/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix attr reader to force the intended values for source and target shas ## What does this MR do? When importing a pull request from GitHub, the old and new branches may no longer actually exist by those names, but we need to recreate the merge request diff with the right source and target shas. We use these `target_branch_sha` and `source_branch_sha` attributes to force these to the intended values. But the reader methods were always looking up to the target/source branch head instead of check if these values was previously set, this MR applies a memoization pattern to both of them. ## Are there points in the code the reviewer needs to double check? This [commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/6ce25e7b4caa9e94de74378729178c7060d640b2) introduced this bug in the importer. ## What are the relevant issue numbers? gitlab-org/gitlab-ce#20385 ## 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)~~ - [X] ~~API support added~~ - Tests - [X] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) /cc @akitaonrails @DouweM See merge request !5573
| * | | | | | | | | | fixup! Fix attr reader to force the intended values for source and target shasfix-gh-pull-requestsDouglas Barbosa Alexandre2016-07-311-6/+2
| | | | | | | | | | |
| * | | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-311-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix attr reader to force the intended values for source and target shasDouglas Barbosa Alexandre2016-07-312-3/+19
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing a pull request from GitHub, the old and new branches may no longer actually exist by those names, but we need to recreate the merge request diff with the right source and target shas. We use these `target_branch_sha` and `source_branch_sha` attributes to force these to the intended values. But the reader methods were always looking up to the target/source branch head instead of check if these values was previously set.
* | | | | | | | | | Merge branch '20473-rails-queue-duration' into 'master' Yorick Peterse2016-08-012-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration See merge request !5592
| * | | | | | | | | | Gitlab::Metrics.current_transaction needs to be public for RailsQueueDurationPaco Guzman2016-08-012-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed grant_type=AUTHORIZATION_CODE for grant_type=authorization_code ## What does this MR do? Changed grant_type=AUTHORIZATION_CODE for grant_type=authorization_code ## Why was this MR needed? Using the example when provided the parameter grant_type=AUTHORIZATION_CODE the server returns a error: ```json {"error":"unsupported_grant_type","error_description":"The authorization grant type is not supported by the authorization server."} ``` See merge request !5539
| * | | | | | | | | | | Changed grant_type=AUTHORIZATION_CODE for grant_type=authorization_code Fernando Derkoski2016-07-281-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-extra-new-line-crlf' into 'master' Rémy Coutable2016-08-015-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim extra displayed carriage returns in diffs and files with CRLFs ## What does this MR do? This MR strips out extra carriage returns at the end of each tokenized string. ## Are there points in the code the reviewer needs to double check? Does this remove more than we need? ## Why was this MR needed? Windows users would see extra lines in their files. Newline characters are already added with every line in the HTML formatter. ## What are the relevant issue numbers? #20440, gitlab-com/support-forum#892, #20468 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] 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 !5588
| * | | | | | | | | | | Fix specsfix-extra-new-line-crlfRémy Coutable2016-08-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Trim extra displayed carriage returns in diffs and files with CRLFsStan Hu2016-08-014-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20440
* | | | | | | | | | | | Merge branch '14202-avoid-line-code-position-calculations' into 'master' Yorick Peterse2016-08-012-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid line_code and position calculation on line partial for plain view See merge request !5591
| * | | | | | | | | | | Avoid line_code and position calculation on line partial for plain view14202-avoid-line-code-position-calculationsPaco Guzman2016-08-012-4/+4
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-0116-106/+322
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sensible state specific default sort order for issues and merge requests ## What does this MR do? It provides more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created | ## Are there points in the code the reviewer needs to double check? All the bits where `id_desc` was changed to `created_desc`. I hope it's okay, It makes more sense in my opinion. ## Why was this MR needed? Prior to this MR the issues and merge request were sorted based on `id_desc` by default. This MR aims to make the interface more user-friendly by providing state specific sorting defaults most users would expect. ## What are the relevant issue numbers? See #15064 See merge request !5453
| * | | | | | | | | | State specific default sort order for issuableszs2016-08-0116-106/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created |
* | | | | | | | | | | Merge branch 'fix/labels-milestones-import' into 'master' Rémy Coutable2016-08-0112-236/+265
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Importing labels and milestones associations - Import/Export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19510 and https://gitlab.com/gitlab-org/gitlab-ce/issues/19447 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] 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 !5426
| * | | | | | | | | | | squashed - fixed label and milestone association problems, updated specs and ↵fix/labels-milestones-importJames Lopez2016-08-0112-236/+265
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored reader class a bit
* | | | | | | | | | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-0119-29/+494
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an URL field to Enviroments ## What does this MR do? Adds a field to the `enviroments` table to expose later in other features. Now I see the task list below, I noticed I forgot some minor things, but Ill adress those after the first review. ## Are there points in the code the reviewer needs to double check? The field is a string on the database, thus limited to 255 chars, which seems more than enough. ## What are the relevant issue numbers? Closes #19527 ## Screenshots (if relevant) ![Screen_Shot_2016-07-25_at_15.22.16](/uploads/5c3f39466f8e2114195270006aed20c0/Screen_Shot_2016-07-25_at_15.22.16.png)![Screen_Shot_2016-07-25_at_15.22.53](/uploads/408cf86610137dd4a861d15dcd677a2c/Screen_Shot_2016-07-25_at_15.22.53.png)![Screen_Shot_2016-07-25_at_15.23.10](/uploads/927c506931f4e0338cdbbc58678bd308/Screen_Shot_2016-07-25_at_15.23.10.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5469
| * | | | | | | | | | | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-013-4/+24
| | | | | | | | | | | |
| * | | | | | | | | | | Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-296-97/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also a couple of minor edits for this branch are included
| * | | | | | | | | | | Incorporate feedbackZ.J. van de Weg2016-07-298-29/+45
| | | | | | | | | | | |
| * | | | | | | | | | | Add API support for environmentsZ.J. van de Weg2016-07-295-0/+313
| | | | | | | | | | | |
| * | | | | | | | | | | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-2914-28/+133
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds a string (thus max 255 chars) field to the enviroments table to expose it later in other features.
* | | | | | | | | | | Merge branch 'new-issue-button-outline' into 'master' Rémy Coutable2016-08-013-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make "New issue" button in Issue page less obtrusive ## What does this MR do? Replace green background of "New issue" button on issue page by green border and text. ## Why was this MR needed? Every issue page has two green buttons&mdash;Comment and New Issue. - New Issue is not directly content related and less likely to be used. - [UI Guide] says > Use green or blue button for primary action. Primary button should be only one. [UI Guide]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/ui_guide.md ## What are the relevant issue numbers? fixes #20186 ## Screenshots ### Before ![before](/uploads/53ab065edb87b3e3c2f25d828b2fcc42/before.png) ### After ![after](/uploads/a9b4254d563a93098fa2f1cecb78f96f/after.png) See merge request !5457
| * | | | | | | | | | | Make "New issue" button in Issue page less obtrusive (!5457)winniehell2016-07-303-2/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'document-yaml-colon' into 'master' Achilleas Pipinellis2016-08-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify CI script needing to quote colons ## What does this MR do? Clarifies documentation for `.gitlab-ci.yml` `script`. ## Are there points in the code the reviewer needs to double check? Should this be a note? Is there a link to YAML spec we can point to? ## Why was this MR needed? ## What are the relevant issue numbers? Closes #20177. ## Screenshots (if relevant) See merge request !5481
| * | | | | | | | | | | Update README.mddocument-yaml-colonMark Pundsack2016-07-271-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Clarify CI script needing to quote colonsMark Pundsack2016-07-251-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-08-011-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update start-using-git.md to reflect that merges to master can be made from either the master or the named branch. ## What does this MR do? The documentation is incorrect in stating that you need to be in the named branch in order to merge to master. You can be in master and merge the named branch, too. ## Are there points in the code the reviewer needs to double check? Yes ## Why was this MR needed? This MR is needed to correct an inaccuracy in the documentation. ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? It is only a documentation change, so mostly this is not applicable. - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5404
| * | | | | | | | | | | | Update start-using-git.mdButch Anton2016-07-211-0/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'clarify-backup-keep-time' into 'master' Achilleas Pipinellis2016-08-011-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify backup_keep_time config parameter with S3 Discussed in gitlab-org/omnibus-gitlab#1453 See merge request !5567
| * | | | | | | | | | | | | Clarify backup_keep_time config parameter with S3clarify-backup-keep-timeStan Hu2016-07-291-0/+7
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussed in gitlab-org/omnibus-gitlab#1453 [ci skip]
* | | | | | | | | | | | | Merge branch 'improve-test-specificity' into 'master' Stan Hu2016-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve spinach test to be more specific about link to click If you add another branch to gitlab-test that includes the word 'test', browse_files.feature will fail with an ambiguous match. See merge request !5589
| * | | | | | | | | | | | Improve spinach test to be more specific about link to clickStan Hu2016-07-311-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you add another branch to gitlab-test that includes the word 'test', browse_files.feature will fail with an ambiguous match.
* | | | | | | | | | | | Merge branch 'fix-invalid-x-forwarded-for-ip' into 'master' Stan Hu2016-08-013-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured. ## What does this MR do? Catches IPAddr::InvalidAddressError exceptions in `trusted_proxy?` when a) a trusted proxy is set up in the gitlab config and b) an invalid IP address is passed to the method (e.g. one with a port attached). When caught, returns `false` from the method. Prevents a 500 error in this situation. ## What are the relevant issue numbers? Closes gitlab-org/gitlab-ce#20466. ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [N/A] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [N/A] API support added - Tests - [X] Added for this feature/bug - [X] All builds are passing - [X] 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 !5584
| * | | | | | | | | | | Moved to 8.10.3 release.lookatmike2016-07-311-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.lookatmike2016-07-313-0/+9
|/ / / / / / / / / / /