summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-206-8/+45
| | | | | | | | | Instead of using a fork, we subclass the filter and only apply the `task-list` class to list items that actually are task lists. Closes #1645 See https://github.com/github/task_list/pull/60
* Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets2015-05-203-5/+13
|\ | | | | | | | | | | | | | | | | | | Add explanation about WIP status to MR form. ![Screen_Shot_2015-05-15_at_13.48.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b3f70585255a043f07c61570549a90ba/Screen_Shot_2015-05-15_at_13.48.49.png) ![Screen_Shot_2015-05-15_at_13.49.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9992708c8ef5ef4fa2bcc2c3173b8e3/Screen_Shot_2015-05-15_at_13.49.01.png) See merge request !666
| * Remove italics and margin from merge request form help.Douwe Maan2015-05-201-1/+1
| |
| * Fix copy.explain-wip-mrDouwe Maan2015-05-171-1/+1
| |
| * Add explanation about WIP status to MR form.Douwe Maan2015-05-153-5/+13
| |
* | Merge branch 'jirutka-shell-secret-path'Marin Jankovski2015-05-196-6/+14
|\ \
| * | Move the changelog item to 7.12Marin Jankovski2015-05-191-1/+3
| | |
| * | Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ↵Marin Jankovski2015-05-196-6/+12
| |\ \ |/ / / | | | | | | jirutka-shell-secret-path
| * | Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-166-6/+12
| | |
* | | Merge pull request #9289 from jirutka/asciidoc-2Robert Speicher2015-05-1810-49/+35
|\ \ \ | | | | | | | | Refactor, simplify and unify helpers for rendering markup
| * | | Simplify and unify helpers for rendering markupJakub Jirutka2015-05-188-34/+20
| | | |
| * | | Rename MarkdownHelper to MarkupHelperJakub Jirutka2015-05-185-15/+15
|/ / /
* | | Merge pull request #9288 from jirutka/asciidocRobert Speicher2015-05-1812-9/+189
|\ \ \ | | | | | | | | | | | | | | | | Improve AsciiDoc rendering See https://github.com/gitlabhq/gitlabhq/pull/9288
| * | | Add changelog items for #9288Jakub Jirutka2015-05-181-0/+2
| | | |
| * | | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)Jakub Jirutka2015-05-189-6/+184
| | | |
| * | | Update asciidoctor gem to the latest versionJakub Jirutka2015-05-182-3/+3
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-1818-35/+140
|\ \ \
| * \ \ Merge branch 'rs-issue-1626' into 'master'Dmitriy Zaporozhets2015-05-183-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix labels for project/snippet visibility selection Closes #1626 See merge request !671
| | * | | Increase left margin for visibility descriptionsrs-issue-1626Robert Speicher2015-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | Now they line up with their title.
| | * | | Fix labels for project/snippet visibility selectionRobert Speicher2015-05-162-2/+2
| | | | |
| * | | | Merge branch 'rs-default-tooltip-placement' into 'master'Dmitriy Zaporozhets2015-05-181-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix default tooltip placement Made a logic error in 1e1785cc that prevented elements with the `has_tooltip` class from having the default tooltip placement if they didn't define one. See merge request !674
| | * | | | Fix default tooltip placementrs-default-tooltip-placementRobert Speicher2015-05-171-2/+2
| | | | | |
| * | | | | Merge branch 'search-issues-by-number' into 'master'Douwe Maan2015-05-184-5/+33
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add search issues/MR by number It allows user to search issues/MR by number, e.g. `#3`. Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/4235923-search-issues-by-number). See merge request !668
| | * | | | Add search issues/MR by numberNikita Verkhovin2015-05-184-5/+33
| |/ / / /
| * | | | Merge branch 'rs-reversible-migrations' into 'master'Robert Speicher2015-05-163-3/+22
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Make more migrations reversible See merge request !646
| | * | | Make more migrations reversiblers-reversable-migrationsRobert Speicher2015-05-133-3/+22
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'unauthorized-participants' into 'master'Dmitriy Zaporozhets2015-05-166-22/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send notifications to mentioned users that don't have access to the project in question. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325. See merge request !664
| | * | | | Fix specs.unauthorized-participantsDouwe Maan2015-05-153-7/+12
| | | | | |
| | * | | | Fix.Douwe Maan2015-05-151-1/+1
| | | | | |
| | * | | | Don't include users without project access in participants.Douwe Maan2015-05-152-7/+15
| | | | | |
| | * | | | Move stuff around a bit in NotifictionService.Douwe Maan2015-05-151-8/+15
| | | | | |
| * | | | | Merge branch 'fix-docker-single-postgresql-startup' into 'master'Sytse Sijbrandij2015-05-152-0/+38
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set gitlab.rb in Docker single image to make PostgreSQL start up properly See gitlab-org/omnibus-gitlab#552 See merge request !661
| | * | | | Set gitlab.rb in Docker single image in order to make PostgreSQL start up ↵Stan Hu2015-05-152-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly See gitlab-org/omnibus-gitlab#552
* | | | | | Merge branch 'test-db-dump' into 'master'Job van der Voort2015-05-182-0/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How to dump a production DB to staging See merge request !1825
| * | | | | | How to dump a production DB to stagingJacob Vosmaer2015-05-182-0/+46
|/ / / / / /
* | | | | | Merge branch 'improve-reset-tokens' into 'master'Dmitriy Zaporozhets2015-05-188-33/+119
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain reset token expiration in emails Update the new user emails to tell new users when their password reset token expires and provide a link to get a new one. See #1921. This MR adds new text to the emails: ```html This link is valid for X days. After it expires, you can <a href='new_user_password_url'>request a new one</a> ``` It will be more difficult to add the same link to the error message that's displayed when a user tries to reset his password with an expired token. Currently, we don't know why the password change fails, we just show the Devise error messages on the form. See merge request !1803
| * | | | | Add tests for password reset token changesVinnie Okada2015-05-161-33/+24
| | | | | |
| * | | | | Fill in email on the new password formVinnie Okada2015-05-164-4/+4
| | | | | |
| * | | | | Redirect if password reset token is expiredVinnie Okada2015-05-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't display the password editing form if the user's token is expired; redirect to the form that allows users to request a new password reset token.
| * | | | | Explain reset token expiration in emailsVinnie Okada2015-05-166-0/+75
|/ / / / / | | | | | | | | | | | | | | | | | | | | Tell new users when their password reset token expires and provide a link to get a new one.
* | | | | Merge branch 'attr_encryped_no_db_connection' into 'master'Dmitriy Zaporozhets2015-05-151-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't require DB connection in AttrEncrypted. See merge request !667
| * | | | | Fix.Douwe Maan2015-05-151-13/+5
| | | | | |
| * | | | | Improve fix.attr_encryped_no_db_connectionDouwe Maan2015-05-151-13/+12
| | | | | |
| * | | | | Don't require DB conncetion in AttrEncrypted.Douwe Maan2015-05-151-0/+29
|/ / / / /
* | | | | Merge pull request #9277 from jvanbaarsen/pr/9061Jeroen van Baarsen2015-05-152-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Ensure that the first added admin performs repository imports
| * | | | | Ensure that the first added admin performs repository importsFotis Gimian2015-05-152-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '7-11-guides' into 'master'Job van der Voort2015-05-153-16/+120
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Update installation/update guides for 7.11. See merge request !665
| * | | | Update installation/update guides for 7.11.Douwe Maan2015-05-153-16/+120
|/ / / /
* | | | Merge branch 'fix-653' into 'master'Dmitriy Zaporozhets2015-05-151-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Fix push event. Fixes issue with !653. See merge request !663
| * | | Fix push event.Douwe Maan2015-05-151-1/+1
|/ / /
View Lorry Controller Status