summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix bug causing dropdown to get cut off in project pagefix_dropdown_getting_cut_off_in_pageArinde Eniola2016-03-161-0/+7
|
* Merge branch 'danielcarraro/gitlab-ce-feature/omniauth-auth0-gem' into 'master' Robert Speicher2016-03-166-0/+101
|\ | | | | | | | | omniauth-auth0 gem support See merge request !3246
| * Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-166-0/+101
| |
* | Merge branch 'dropdown-caret-color' into 'master' Jacob Schatz2016-03-163-3/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with dropdown caret being incorrect color Previously: ![Screen_Shot_2016-03-16_at_19.31.20](/uploads/b887a7b8249f172513c68289c52a4cf7/Screen_Shot_2016-03-16_at_19.31.20.png) Now: ![Screen_Shot_2016-03-16_at_19.29.37](/uploads/9c0d6a3002c18a8c7890df8dce612dcb/Screen_Shot_2016-03-16_at_19.29.37.png) See merge request !3254
| * | Fixes issue with dropdown caret being incorrect colorPhil Hughes2016-03-163-3/+1
|/ /
* | Merge branch 'ci-runners-token-index' into 'master' Yorick Peterse2016-03-162-4/+18
|\ \ | | | | | | See merge request !3249
| * | Added an index on ci_runners.tokenYorick Peterse2016-03-162-4/+18
| |/ | | | | | | | | | | On PostgreSQL the index is created concurrently. Fixes gitlab-org/gitlab-ce#14325
* | Merge branch 'css-hex-format' into 'master' Jacob Schatz2016-03-1645-242/+242
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the CSS Style Guide rules for HEX colors. Use lowercase letters and shorthand values for HEX colors where possible, in accordance with the CSS Style Guide. Discussed in #14299. \cc @jschatz1 @rspeicher See merge request !3238
| * | Follow the CSS Style Guide rules for HEX colors.connorshea2016-03-1545-242/+242
| | | | | | | | | | | | | | | | | | | | | Use lowercase letters and shorthand values for HEX colors where possible. Discussed in #14299.
* | | Merge branch 'git-version' into 'master' Jacob Vosmaer2016-03-161-3/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Install Git 2.7.3, not 2.4.3 See merge request !3248
| * | Fix golang shasum invocationJacob Vosmaer2016-03-161-1/+1
| | |
| * | Update Git source installation steps to 2.7.3Jacob Vosmaer2016-03-161-2/+3
|/ /
* | Merge branch 'doc-updates' into 'master' Achilleas Pipinellis2016-03-162-12/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix requirements.md link and improve PostgreSQL commands - Point requirements.md link to the correct location - Link to gitlab installation.md document instead of github - Use psql command switch to run specified SQL commands for creation of user and database permissions. - Instead of requiring a comment like `# Do not type the 'template1=#', this is part of the prompt` it may be easier to just use the command switch with `psql` to execute the SQL commands. *forgot [ci skip] :(* See merge request !3176
| * | Use relative link for installation.mdChris Wilson2016-03-151-1/+1
| | |
| * | Revert to relative requirements.md link use gitlab.com link for installation ↵Chris Wilson2016-03-152-2/+2
| | | | | | | | | | | | guides.
| * | Fix requirements.md link and improve PostgreSQL commandsChris Wilson2016-03-112-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Point requirements.md link to the correct location - Link to gitlab installation.md document instead of github - Use psql command switch to run specified SQL commands for creation of user and database permissions.
* | | Merge branch 'issue_14306' into 'master' Robert Speicher2016-03-162-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Return an empty Array when there aren't lines to parse. Fixes #14306 See merge request !3243
| * | | Return an empty Array when there aren't lines to parse.Rubén Dávila2016-03-152-0/+7
| | | |
* | | | Merge branch 'support-utf8-wiki-page-title' into 'master' Douwe Maan2016-03-166-7/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Wiki with UTF-8 page name ## What does this MR do? Support Wiki with UTF-8 page name. See https://github.com/gollum/gollum/pull/929 ## Why was this MR needed? Relax constraints for wiki slug in aac6598482036e12a20b4c75f2a508bd6a017245. It allows to create a wiki with UTF-8 name, but creating a wiki with UTF-8 name causes 500 error. Creating a wiki with UTF-8 name once, then creating or updating wiki with ascii name also cause 500 error i.e. no one can create and update any wiki pages in the project. ## Workaround 1. Go to `https://DOMAIN/repo/wikis/git_access` -> this page display the link to git clone 2. Clone the wiki repo 3. Find the page with UTF-8 name 4. Rename or Delete these files 5. Commit and push ## What are the relevant issue numbers? - #13979 - #13891 - #13698 - #13603 - #13317 - #12906 - #12825 - #10945 ## Todo - [x] Waiting for 'gollum-rugged_adapter' that support rugged v0.24.0 release 'gollum-rugged_adapter' gem doesn't allow to install rugged v0.24.0 (it's still beta version), but 'gitlab_git' gem depends on rugged v0.24.0b13. So it can't install both 'gollum-rugged_adapter' and 'gitlab_git' now. See merge request !2999
| * | | | Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-166-7/+27
| | | | |
* | | | | Merge branch 'worker-for-user-deletion' into 'master' Douwe Maan2016-03-1610-26/+117
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | A worker deletes a user, so the request doesn't time out Fixes #13261 See merge request !2855
| * | | | Specs for the DeleteUserServiceworker-for-user-deletionZeger-Jan van de Weg2016-03-153-50/+69
| | | | |
| * | | | Clearify who deletes the userZeger-Jan van de Weg2016-03-156-9/+10
| | | | |
| * | | | Fix broken specsZeger-Jan van de Weg2016-03-152-10/+7
| | | | |
| * | | | Target right release, rebase got it wrongZeger-Jan van de Weg2016-03-152-2/+3
| | | | |
| * | | | Specs on force deleting of a userZeger-Jan van de Weg2016-03-152-7/+43
| | | | |
| * | | | Add ability to delete a user with forceZeger-Jan van de Weg2016-03-156-18/+22
| | | | |
| * | | | A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-154-1/+34
| | |_|/ | |/| | | | | | | | | | Fixes #13261
* | | | Merge branch 'fix-capybara-deprecation-warnings' into 'master' Robert Speicher2016-03-163-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Capybara 2.6.2 deprecation warnings See merge request !3236
| * | | | Fix Capybara 2.6.2 deprecation warningsStan Hu2016-03-153-3/+3
| | | | |
* | | | | Merge branch 'git-2-7-3' into 'master' Robert Speicher2016-03-154-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Git version requirement to 2.7.3 [ci skip] See merge request !3240
| * | | | | Fix changelogDouwe Maan2016-03-151-1/+3
| | | | | |
| * | | | | Merge branch 'master' into git-2-7-3Douwe Maan2016-03-15132-4230/+2108
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'issue_14301' into 'master' Robert Speicher2016-03-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes label on "Assignee" dropdown Fixes #14301 See merge request !3239
| * | | | | | TypoAlfredo Sumaran2016-03-151-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dropdown-vertical-spacing' into 'master' Jacob Schatz2016-03-151-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed overflow on users name in dropdowns Closes #14289 ![Screen_Shot_2016-03-15_at_17.38.09](/uploads/803341031c468069709afd99a6c540be/Screen_Shot_2016-03-15_at_17.38.09.png) See merge request !3235
| * | | | | Fixed overflow on users name in dropdownsdropdown-vertical-spacingPhil Hughes2016-03-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #14289
* | | | | | Merge branch '12743-subscribe-to-label' into 'master' Rémy Coutable2016-03-1541-137/+660
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow subscribing to labels This implement #12743 and supersedes !2799 (thanks @timothyandrew!). - Subscribe (and unsubscribe) for labels - When an issue/merge request is created, notify all subscribers of all its labels - When an issue/merge request is edited, notify all subscribers of all its newly-added labels ## Done - [x] Verify that a user is signed in to subscribe/unsubscribe from a label. - [x] Merge conflicts - [x] Integration tests - [x] `issuable.subscribed?` should check subscribers and participants - [x] When an issuable is relabeled, notify subscribers of the *newly added* labels only - [x] Screenshots: ### Labels page ![Screen_Shot_2016-03-07_at_19.05.44](/uploads/3e69064e9e1a06ee2e27c778776c1407/Screen_Shot_2016-03-07_at_19.05.44.png) ### HTML email ![Screen_Shot_2016-03-07_at_19.07.36](/uploads/e484e06366a738385f1f6d71b52eecf7/Screen_Shot_2016-03-07_at_19.07.36.png) ### Plain text email ![Screen_Shot_2016-03-07_at_19.07.50](/uploads/dc05f710a8f7ab5eae9f72aa2110e741/Screen_Shot_2016-03-07_at_19.07.50.png) PS: I've set the milestone to 8.6 since it's getting late for 8.5... See merge request !3115
| * | | | | Create a SentNotification record for #relabeled_issue_email / ↵Rémy Coutable2016-03-153-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | #relabeled_merge_request_email
| * | | | | Move the #toggle_subscription controller method to a concernRémy Coutable2016-03-153-28/+15
| | | | | |
| * | | | | Improving the original label-subscribing implementationRémy Coutable2016-03-1536-310/+439
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
| * | | | | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-1531-64/+458
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
* | | | | | Add 8.5.6 CHANGELOG itemsRémy Coutable2016-03-151-0/+3
| |_|_|/ / |/| | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'css-style-guide' into 'master' Jacob Schatz2016-03-158-0/+393
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS style guide Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI. TODO: - [x] Agree on and write SCSS Style Guide Documentation. - [x] Document the `scss-lint` config file. - [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should. - [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?). My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect. Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources. /cc @jschatz1 @rspeicher See merge request !3069
| * | | | | Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add ↵connorshea2016-03-148-0/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation for SCSS Style Guide. See !3069 for more information.
* | | | | | Merge branch 'if-statement-syntax-fix' into 'master' Robert Speicher2016-03-151-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove parentheses from if statement Otherwise Rubocop will give a warning after we upgrade it. As discussed in !3197. [ci skip] See merge request !3231
| * | | | | Remove parentheses from if statementconnorshea2016-03-151-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise Rubocop will give a warning. As mentioned in !3197.
* | | | | Merge branch 'fix-activerecord-join-stupidity' into 'master' Robert Speicher2016-03-152-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore eager loading in Project.search UNION This fixes issues such as filtering groups by names on pages such as https://gitlab.com/dashboard/groups. See merge request !3229
| * | | | | Ignore eager loading in Project.search UNIONYorick Peterse2016-03-152-0/+13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The queries that are UNION'd together don't need any eager loading (since we really only use the resulting SQL instead of having ActiveRecord actually run the queries). By dropping any eager loaded associations queries such as the following work instead of producing a SQL error: Project.all.includes(:namespace).search('foo')
* | | | | Merge branch 'todos-title-attr' into 'master' Robert Speicher2016-03-156-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Set link title for todos. Closes #14042 See merge request !3161