summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Fix diff header with submodule changeDmitriy Zaporozhets2015-05-291-2/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-299-60/+97
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs-persist-tab-selection-more-betterer' into 'master'Dmitriy Zaporozhets2015-05-298-59/+96
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve MergeRequest tab-persisting behavior Now uses the path instead of the hash. See discussion in !728 See merge request !737
| | * | | | | | | | Improve MergeRequest tab-persisting behaviorrs-persist-tab-selection-more-bettererRobert Speicher2015-05-293-35/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now uses the path instead of the hash. See discussion in #728.
| | * | | | | | | | Add MergeRequests#commits action and routeRobert Speicher2015-05-293-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /:namespace_id/:project_id/merge_requests/:id/commits(.:format)
| | * | | | | | | | Bump turbolinks versionRobert Speicher2015-05-292-7/+7
| | |/ / / / / / /
| * | | | | | | | Merge branch 'master' into 'master'Robert Speicher2015-05-291-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra brace Extraneous curly brace creeped in prior commit. See merge request !734
| | * | | | | | | Remove extra braceMike Butsko2015-05-281-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #9318 from jvanbaarsen/allow-special-chars-bioDmitriy Zaporozhets2015-05-293-12/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Allow special characters in users bio
| * | | | | | | Allow special characters in users bioJeroen van Baarsen2015-05-283-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It removes the very strict sanitation on the users bio field, so that people can have a bio like "I <3 GitLab" **Why is this needed?** Currently when you enter a bio with "I <3 GitLab", we only store "I ". This is unexpected behaviour, since we want users to have a normal profile, without having to worry what characters are allowed and which are not. **Related issues:** Fixes https://github.com/gitlabhq/gitlabhq/issues/5625 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | | | Merge branch 'nicer-acccount-page' into 'master'Dmitriy Zaporozhets2015-05-282-14/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make user settings account page nicer * make 2 factor auth section `panel-default` * make oauth buttons smaller * remove primary button from reset token form ![Screenshot_2015-05-28_20.37.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e536723e087b72a5c08b29072fb4972f/Screenshot_2015-05-28_20.37.30.png) See merge request !733
| * | | | | | | | Make user settings account page nicerDmitriy Zaporozhets2015-05-282-14/+14
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'project-aside' into 'master'Dmitriy Zaporozhets2015-05-282-79/+77
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use panels instead of well for widgets in project sidebar Cleaner look and less distractive ![Screenshot_2015-05-28_17.31.27](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4f8e58f76c7f62c488dd571c313e21e/Screenshot_2015-05-28_17.31.27.png) See merge request !732
| * | | | | | | | Use panels instead of well for widgets in project sidebarDmitriy Zaporozhets2015-05-282-79/+77
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'profile-settings'Dmitriy Zaporozhets2015-05-2811-110/+129
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/profiles/accounts/show.html.haml
| * | | | | | | | Fix profile tests after header renameDmitriy Zaporozhets2015-05-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Prefer panels over fieldset when different formsDmitriy Zaporozhets2015-05-283-83/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Consistent header look for setting pagesDmitriy Zaporozhets2015-05-283-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Re-organize profile settings titles and headersDmitriy Zaporozhets2015-05-288-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2815-42/+112
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'user-destroy-wo-groups' into 'master'Dmitriy Zaporozhets2015-05-2810-33/+69
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can not remove user if he/she is an only owner of group To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !730
| | * | | | | | | | Fix current user removaluser-destroy-wo-groupsDmitriy Zaporozhets2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | Add CHANGELOG itemDmitriy Zaporozhets2015-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-289-33/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Merge branch 'fix-git-blame-syntax-highlighting' into 'master'Douwe Maan2015-05-286-9/+43
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix git blame syntax highlighting when different commits break up lines ### What does this MR do? This MR fixes a bug where syntax highlighting would not work properly in certain lines when doing a `git blame` view of a file. Also, this MR reuses the Rugments lexer and formatter for each `git blame` commit block, which should make things faster and reduce overhead. ### Why was this MR needed? When doing a `git blame`, GitLab feeds the Rugments lexer/formatter blocks of code based on the latest commit for each line. However, this can cause lexer to fail because the state is cleared between each block of code, which causes `highlight` to fallback to the plaintext lexer. For example, notice this unhighlighted line in [this file](https://gitlab.common-lisp.net/cmucl/cmucl/blame/master/src/assembly/assemfile.lisp): ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b403fe5c2b883882a9eeea7e0409c583/image.png) The fixed version looks like this: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/32c4d7c8ff15a7d59b364dd988f7c657/image.png) This MR requires a patch to rugments to allow the `continue` option to be passed to the lexer. * https://github.com/rumpelsepp/rugments/pull/24 * https://github.com/rumpelsepp/rugments/pull/23 * Also submitted to rouge: https://github.com/jneen/rouge/pull/267 ### What are the relevant issue numbers? Closes #1521 See merge request !697
| | * | | | | | | | Fix git blame syntax highlighting when different commits break up linesStan Hu2015-05-276-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1521
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-281-3/+15
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #9335 from stefan-it/documentation/timezone-clarificationsJeroen van Baarsen2015-05-281-3/+15
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | [Documentation] non-omnibus instructions for changing time zone
| | * | | | | | | | | Adds new section for changing time zone in GitLab configuration file. New ↵Stefan Schweter2015-05-271-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | section added for changing time zone in Omnibus installations.
* | | | | | | | | | | Merge branch 'chlg-update' into 'master'Marin Jankovski2015-05-281-7/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update changelog for 7.11.4 See merge request !1833
| * | | | | | | | | | update changelog for 7.11.4Job van der Voort2015-05-281-7/+14
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #9184 from rumpelsepp/englishJeroen van Baarsen2015-05-281-17/+18
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Some language improvements
| * | | | | | | | | Some language improvementsStefan Tatschner2015-05-271-17/+18
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-persist-tab-selection' into 'master'Dmitriy Zaporozhets2015-05-284-59/+100
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist current merge request tab selection via URL Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350 See merge request !728
| * | | | | | | | | Persist current merge request tab selection via URLrs-persist-tab-selectionRobert Speicher2015-05-274-59/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
* | | | | | | | | | Merge branch 'header-icons' into 'master'Dmitriy Zaporozhets2015-05-281-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change some header icons icons changed: * profile settings: user icon to cog * admin area: cogs to wrench Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/719#note_1289290 ![Screenshot_2015-05-27_17.58.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/762de4afb8ae229a96ead8b2d213b2a4/Screenshot_2015-05-27_17.58.12.png) See merge request !726
| * | | | | | | | | | Replace some icons in headerheader-iconsDmitriy Zaporozhets2015-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'rs-no-killers-in-development' into 'master'Marin Jankovski2015-05-281-4/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable Unicorn::WorkerKiller in non-production environments Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2281 See merge request !729
| * | | | | | | | | | Disable Unicorn::WorkerKiller in non-production environmentsrs-no-killers-in-developmentRobert Speicher2015-05-271-4/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'rs-dont-follow-me' into 'master'Douwe Maan2015-05-275-2/+89
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ExternalLinkFilter to Markdown pipeline Forces a `rel="nofollow"` attribute on all external links. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_46525 See merge request !727
| * | | | | | | | | Add ExternalLinkFilter to Markdown pipeliners-dont-follow-meRobert Speicher2015-05-275-2/+89
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Forces a `rel="nofollow"` attribute on all external links.
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2718-47/+131
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'browse-milestone-issues' into 'master'Douwe Maan2015-05-2714-46/+116
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone "Browse Issues" button. After refactoring around issue/merge requests filters, the button stopped working :( See merge request !699
| | * | | | | | | | Fix spec.browse-milestone-issuesDouwe Maan2015-05-271-2/+2
| | | | | | | | | |
| | * | | | | | | | Add Browse Issues button to Dashboard and Group milestones.Douwe Maan2015-05-274-4/+10
| | | | | | | | | |
| | * | | | | | | | Fix milestone "Browse Issues" button.Douwe Maan2015-05-273-3/+4
| | | | | | | | | |
| | * | | | | | | | Set milestone on new issue when creating issue from index with milestone ↵Douwe Maan2015-05-277-37/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter active.
| * | | | | | | | | Merge branch 'fix-disabled-project-snippet-feature' into 'master'Douwe Maan2015-05-274-1/+15
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project snippets button appearing when it is disabled There was a typo in 9bcd36396b9b that caused the project snippets option to be shown when it is disabled. Closes #1705 See merge request !720
| | * | | | | | | | | Fix project snippets button appearing when it is disabledStan Hu2015-05-274-1/+15
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1705
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-273-1/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | |