summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Changes after review25374-svg-as-propFilipa Lacerda2016-12-092-4/+4
|
* Fix broken testFilipa Lacerda2016-12-091-2/+2
|
* Adds CHANGELOG entryFilipa Lacerda2016-12-091-0/+4
|
* Adds testsFilipa Lacerda2016-12-096-25/+62
|
* Uniformize props name formatFilipa Lacerda2016-12-098-33/+34
|
* Replace commit icon svg logicFilipa Lacerda2016-12-092-20/+8
|
* Replace play icon svg logicFilipa Lacerda2016-12-094-29/+28
|
* Merge branch '15081-wrong-login-tab-ldap-frontend' into 'master' Fatih Acet2016-12-097-1/+115
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists ## What does this MR do? Fixes issue: 15081 Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists This is done by saving into a cookie when the active tab changes and by always selecting that tab when the page is loaded. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? In order to fix the issue: 15081 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #15081 See merge request !7314
| * Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs ExistsJacopo2016-12-027-1/+115
| | | | | | | | | | | | | | When ldap is enabled and use "Standard" authentication method, if authentication fails the correct tab remain selected. This is done by saving into localStorage when the active tab changes and by always selecting that tab when the page is loaded.
* | Merge branch '1392-honor-database-password' into 'master' Achilleas Pipinellis2016-12-091-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Updating reference to database password ## What does this MR do? Updates references to postgresql['sql_password'] to use gitlab_rails['db_password'] instead. Original value is not used anywhere. For gitlab-org/omnibus-gitlab#1392 we're using gitlab_rails['db_password'] to create a .pgpass as needed. See merge request !8000
| * | Updating reference to database password1392-honor-database-passwordIan Baum2016-12-081-2/+2
| | | | | | | | | | | | | | | postgresql['sql_password'] is not used, should be gitlab_rails['db_password']
* | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-12-098-29/+18
|\ \ \
| * | | Update CHANGELOG.md for 8.13.9Alejandro Rodríguez2016-12-081-0/+5
| | | | | | | | | | | | [ci skip]
| * | | Update CHANGELOG.md for 8.14.4Alejandro Rodríguez2016-12-088-29/+13
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'dz-nested-groups' into 'master' Douwe Maan2016-12-0926-159/+402
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nested groups support on data level ## What does this MR do? - [x] Add `parent_id` field to `Namespace`model. - [x] Create new database table `routes` that keeps information about full path to each group or project - [x] Remove uniq index from `namespaces.path` - [x] Add uniq index on `routes.path` - [x] Fill routes table with path data from namespaces and projects - [x] Change Namespace/Project URL lookup by routes table - [x] Rename related routes (nested groups, projects) when parent path changes This is solely backend preparation. UI, Permissions and API support will be added in separate merge request. ## Are there points in the code the reviewer needs to double check? migrations, Route model, Routable concern Will require downtime. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121#note_19490281 discussion ## Why was this MR needed? One step further to full nested groups support ## Screenshots (if relevant) No UI changes in this merge request so far ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added~~ - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7121
| * | | | Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-0826-159/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add parent_id field to namespaces table to store relation with nested groups * create routes table to keep information about full path of every group and project * project/group lookup by full path from routes table Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-0822-60/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace MR access checks with use of MergeRequestsFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested - [x] :bomb: app/finders/notes_finder.rb:17 - [x] :warning: app/views/layouts/nav/_project.html.haml:80 [`.count`] - [x] :bomb: app/controllers/concerns/creates_commit.rb:84 - [x] :traffic_light: app/controllers/projects/commits_controller.rb:24 - [x] :traffic_light: app/controllers/projects/compare_controller.rb:56 - [x] :vertical_traffic_light: app/controllers/projects/discussions_controller.rb:29 - [x] :white_check_mark: app/controllers/projects/todos_controller.rb:27 - [x] :vertical_traffic_light: app/models/commit.rb:268 - [x] :white_check_mark: lib/gitlab/search_results.rb:71 - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)` - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`. - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?` See merge request !2033
* | | | | Merge branch 'html-safe-diff-line-content' into 'security' Robert Speicher2016-12-083-10/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't accidentally mark unsafe diff lines as HTML safe Fixes potential XSS issue when a legacy diff note is created on a merge request whose diff contained HTML See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249 See merge request !2040
* | | | | Merge branch 'rs-filter-authentication_token' into 'security' Douwe Maan2016-12-082-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Add authentication_token to filter_parameters list See merge request !2041
* | | | | Merge branch 'destroy-session' into 'security' Robert Speicher2016-12-082-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroy a user session when they delete their own account via browser This patch destroys a user's session when they delete their own account using a browser. A new session is created as they are redirected to the sign_in page. Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/25015 See merge request !2042
* | | | | Merge branch 'fix-reset-template' into 'master' Fatih Acet2016-12-081-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix JS error when reseting new issue template Fixes JS error when trying to reset template when no template has been set. See merge request !7978
| * | | | | Do nothing if file is undefinedfix-reset-templateAlfredo Sumaran2016-12-071-0/+2
| | | | | |
* | | | | | Merge branch 'system-notes-fade' into 'master' Fatih Acet2016-12-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fade out should be white instead of gray Currently, you can see the hard edge of the fade out because it's a light shade of gray rather than white. Before: ![Screen_Shot_2016-12-07_at_12.36.10_PM](/uploads/c8fd2c6ba1742d1260614fd4c9cb29c9/Screen_Shot_2016-12-07_at_12.36.10_PM.png) After: ![Screen_Shot_2016-12-07_at_12.35.53_PM](/uploads/52b51e4a825658a0c440e0f1fb86a31c/Screen_Shot_2016-12-07_at_12.35.53_PM.png) cc @nmrony See merge request !7979
| * | | | | | Fade out should be white instead of graysystem-notes-fadeAnnabel Dunstone Gray2016-12-071-1/+1
| |/ / / / /
* | | | | | Merge branch 'small-emoji-adjustments' into 'master' Fatih Acet2016-12-084-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various small emoji positioning adjustments ## What does this MR do? It changes various emoticon related css rules with very small minor tweaks of 1 or 2 px ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? aesthetics ## Screenshots (if relevant) - ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? none See merge request !7993
| * | | | | | Various small emoji positioning adjustmentssmall-emoji-adjustmentsDimitrie Hoekstra2016-12-084-3/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'timeago-perf-fix' into 'master' Fatih Acet2016-12-082-1/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed timeago re-rendering every element ## What does this MR do? Fixes an issue when new notes are added timeago will be initialised for every timeago element on the page again and therefore adding more timeouts. See merge request !7969
| * | | | | Fixed timeago re-rendering every elementtimeago-perf-fixPhil Hughes2016-12-072-1/+7
| | |_|/ / | |/| | | | | | | | | | | | | Fixes a performance regression that was causing timeago to get re-rendered on every element & therefore adding a lot of new setTimeouts
* | | | | Merge branch 'pipeline-stage' into 'master' Rémy Coutable2016-12-0833-193/+497
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine pipeline stages ## What does this MR do? Introduces a concept of `Ci::Stage` to make it easier to have detailed statuses. ## Why was this MR needed? This is needed to simplify the handling of `Ci::Statuses` and make the `Stage` actual concept in code: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7889 See merge request !7927
| * | | | | Don't check if stage name doesn't existKamil Trzcinski2016-12-082-5/+3
| | | | | |
| * | | | | Fix specspipeline-stageKamil Trzcinski2016-12-074-14/+14
| | | | | |
| * | | | | Move .pipeline-graph to pipelines/graphKamil Trzcinski2016-12-073-3/+3
| | | | | |
| * | | | | Code reviewKamil Trzcinski2016-12-077-21/+18
| | | | | |
| * | | | | Add Ci::Status::FactoryKamil Trzcinski2016-12-074-51/+76
| | | | | |
| * | | | | Fix success statusKamil Trzcinski2016-12-072-2/+3
| | | | | |
| * | | | | Added Ci::Stage specsKamil Trzcinski2016-12-068-9/+165
| | | | | |
| * | | | | Update stage rendering viewsKamil Trzcinski2016-12-068-42/+35
| | | | | |
| * | | | | Fix handling of allowed to failure jobsKamil Trzcinski2016-12-067-63/+49
| | | | | |
| * | | | | Fix handling of skipped vs success statusKamil Trzcinski2016-12-062-5/+5
| | | | | |
| * | | | | Fix test failuresKamil Trzcinski2016-12-064-9/+11
| | | | | |
| * | | | | Added Stage testsKamil Trzcinski2016-12-064-1/+64
| | | | | |
| * | | | | Add Ci::Status::StageKamil Trzcinski2016-12-063-0/+65
| | | | | |
| * | | | | Preserve stage values and use StaticModelKamil Trzcinski2016-12-061-5/+11
| | | | | |
| * | | | | Introduce `Ci::Stage`, right now this is artificial object that is build ↵Kamil Trzcinski2016-12-0612-59/+61
| | | | | | | | | | | | | | | | | | | | | | | | dynamically.
| * | | | | Fix broken pipeline rendering [ci skip]Kamil Trzcinski2016-12-062-12/+11
| | | | | |
| * | | | | Support pipelines APIKamil Trzcinski2016-12-066-21/+32
| | | | | | | | | | | | | | | | | | | | | | | | Pass `updated_at` to get only incremental changes since last update
* | | | | | Merge branch ↵Sean McGivern2016-12-085-19/+99
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25171-fix-mr-features-settings-hidden-when-builds-are-disabled' into 'master' Remove wrong '.builds-feature' class from the MR settings fieldset Closes #25171 See merge request !7930
| * | | | | | Remove wrong '.builds-feature' class from the MR settings fieldset25171-fix-mr-features-settings-hidden-when-builds-are-disabledRémy Coutable2016-12-075-19/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '24982-ux-improvement-sign-in-success-message' into 'master' Sean McGivern2016-12-084-6/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #24982 See merge request !7837
| * | | | | | | fix: 24982- Remove'Signed in successfully' messagejnoortheen2016-12-074-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this change the sign-in-success flash message will not be shown refactor: set flash message to be nil while signing in test: changed tests to reflect removal of sign-in message refactor: adding signed_in message back See Merge Request !7837 issue#24982