summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | new-branch-buttonZeger-Jan van de Weg2016-03-1511-4/+81
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix_horizontal_overflow_in_code_tag' into 'master' Jacob Schatz2016-03-171-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix horizontal overflow that occurs in the code tag closes #14167 ### Before Fix ![Screen_Shot_2016-03-16_at_9.10.52_PM](/uploads/b4a282ffc33684983d7e2482b8e13a8f/Screen_Shot_2016-03-16_at_9.10.52_PM.png) ### After Fix ![Screen_Shot_2016-03-16_at_9.11.16_PM](/uploads/8acca3b46bfdbd929cc096ad070022e2/Screen_Shot_2016-03-16_at_9.11.16_PM.png) See merge request !3255
| * | | | | | | | | | | Added comment to make builds runJacob Schatz2016-03-171-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | fix horizontal overflow that occurs in the code tagArinde Eniola2016-03-161-0/+6
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'css-space-after-colon' into 'master' Jacob Schatz2016-03-1710-32/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the CSS Style Guide rules for including a space after the property colon. Fixes violations of SpaceAfterPropertyColon. Discussed in #14299. [ci skip] cc: @rspeicher @jschatz1 See merge request !3260
| * | | | | | | | | | | Follow the CSS Style Guide rules for including a space after the property colon.connorshea2016-03-1610-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes violations of SpaceAfterPropertyColon. Discussed in #14299. [ci skip]
* | | | | | | | | | | | Merge branch 'fix/reuse-existing-no-cache-method' into 'master' Kamil Trzciński2016-03-172-13/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse `no_cache_headers` method in badges controller Closes #14100 See merge request !3269
| * | | | | | | | | | | Reuse `no_cache_headers` method in badges controllerGrzegorz Bizon2016-03-172-13/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Schilling2016-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in README.md See merge request !3250
| * | | | | | | | | | | Fix typo in README.md.Mark Pundsack2016-03-161-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix_wiki_links' into 'master' Robert Speicher2016-03-175-4/+25
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wiki search results point to raw source Closes https://github.com/gitlabhq/gitlabhq/issues/9581 See merge request !3138
| * | | | | | | | | | Fix wiki search results point to raw sourceHiroyuki Sato2016-03-175-4/+25
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'css-zero-unit-fix' into 'master' Jacob Schatz2016-03-1726-139/+140
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the CSS Style Guide rules for unitless zero values. Discussed in #14299. cc: @rspeicher @jschatz1 See merge request !3259
| * | | | | | | | | Follow the CSS Style Guide rules for unitless zero values.connorshea2016-03-1626-139/+140
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Emoji Rake task to conform to style guide. Discussed in #14299. [ci skip]
* | | | | | | | | 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