summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-issue-1645' into 'master'Dmitriy Zaporozhets2015-05-201-2/+2
|\
| * Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-201-2/+2
* | workaround for buggy lexersHannes Rosenögger2015-05-201-2/+4
|/
* Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets2015-05-203-5/+13
|\
| * 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
* | Simplify and unify helpers for rendering markupJakub Jirutka2015-05-185-30/+7
* | Rename MarkdownHelper to MarkupHelperJakub Jirutka2015-05-183-7/+7
* | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)Jakub Jirutka2015-05-183-3/+26
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-188-21/+52
|\ \
| * \ Merge branch 'rs-issue-1626' into 'master'Dmitriy Zaporozhets2015-05-183-3/+3
| |\ \
| | * | Increase left margin for visibility descriptionsrs-issue-1626Robert Speicher2015-05-161-1/+1
| | * | 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 placementrs-default-tooltip-placementRobert Speicher2015-05-171-2/+2
| | |/ /
| * | | Add search issues/MR by numberNikita Verkhovin2015-05-182-2/+18
| |/ /
| * | Merge branch 'unauthorized-participants' into 'master'Dmitriy Zaporozhets2015-05-162-14/+29
| |\ \ | | |/ | |/|
| | * Fix.Douwe Maan2015-05-151-1/+1
| | * Don't include users without project access in participants.Douwe Maan2015-05-151-6/+14
| | * Move stuff around a bit in NotifictionService.Douwe Maan2015-05-151-8/+15
* | | 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
* | | Explain reset token expiration in emailsVinnie Okada2015-05-163-0/+23
|/ /
* | Fix push event.Douwe Maan2015-05-151-1/+1
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-1510-24/+34
|\
| * Merge branch 'dashboard-references' into 'master'Dmitriy Zaporozhets2015-05-157-13/+15
| |\
| | * Fix reference links in dashboard activity and ATOM feeds.dashboard-referencesDouwe Maan2015-05-147-13/+15
| * | Merge branch 'spinner-spin' into 'master'Dmitriy Zaporozhets2015-05-151-6/+6
| |\ \
| | * | Spin icon next to "Checking for CI status..."spinner-spinDouwe Maan2015-05-141-6/+6
| | |/
| * | Merge branch 'use-count-badges' into 'master'Dmitriy Zaporozhets2015-05-152-5/+13
| |\ \
| | * | Small refactoring of state_filters_text_for helperuse-count-badgesDmitriy Zaporozhets2015-05-141-3/+2
| | * | append empty space only if count existsDmitriy Zaporozhets2015-05-141-1/+1
| | * | Use count badges with number_with_delimiter helper for issue, commit countDmitriy Zaporozhets2015-05-142-5/+14
* | | | Merge pull request #9296 from jorgevbo/masterJeroen van Baarsen2015-05-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix bug with default timezone en RSS gitlab eventsJorge Vasquez2015-05-141-1/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-142-9/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Refactor SessionsController to use a controller concernrs-refactor-2faRobert Speicher2015-05-142-9/+33
| |/ /
* | | Add style for <kbd> element in markdownafc1632015-05-141-0/+16
|/ /
* | Use slightly fewer icons in project sidebar.Douwe Maan2015-05-141-6/+0
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-145-32/+32
|\ \
| * \ Merge branch 'fix-group-mention' into 'master'Dmitriy Zaporozhets2015-05-142-3/+3
| |\ \
| | * | Fix mentioning of private groups.Douwe Maan2015-05-142-3/+3
| | |/
| * | Always show note action icons.Douwe Maan2015-05-143-29/+29
| |/
* | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-142-3/+3
|\ \ | |/ |/|
| * Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-242-3/+3
* | Fix text overflow in project sidebarDmitriy Zaporozhets2015-05-131-0/+4
* | Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-131-2/+9
|\ \
| * | Improve OAuth signup error message.Douwe Maan2015-05-131-2/+9
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-132-140/+15
|\ \ \