summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-atom-feeds' into 'master'Douwe Maan2015-05-217-7/+7
* Merge branch 'rs-issue-1568' into 'master'Douwe Maan2015-05-211-0/+8
* Merge branch 'lexer_error_workaround' into 'master'Douwe Maan2015-05-201-2/+4
* Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets2015-05-203-5/+13
* 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
|\ \ \
| * \ \ Merge pull request #9276 from jirutka/relative_link_filterDmitriy Zaporozhets2015-05-131-140/+0
| |\ \ \
| | * | | Extract handling of relative file links to RelativeLinkFilterJakub Jirutka2015-05-111-140/+0
| * | | | Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commitJeroen van Baarsen2015-05-131-0/+15
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Call merge request web hook for each commitsArthur Gautier2015-05-131-0/+15
* | | | | Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-135-1/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable version check only for production environmentDmitriy Zaporozhets2015-05-111-1/+3
| * | | | Fix syntax errorDmitriy Zaporozhets2015-05-081-1/+1
| * | | | Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-085-1/+20
| |\ \ \ \
| | * | | | Remove encryptionDmitriy Zaporozhets2015-05-081-3/+1
| | * | | | Add feature to disable version checkDmitriy Zaporozhets2015-03-104-4/+13
| | * | | | Add version check to help page tooDmitriy Zaporozhets2015-03-091-0/+1
| | * | | | Prevent crash if file does not existsDmitriy Zaporozhets2015-03-091-1/+3
| | * | | | Add version check badge to admin areaDmitriy Zaporozhets2015-03-092-1/+10
* | | | | | Merge branch 'fix-avatar-removal' into 'master'Hannes Rosenögger2015-05-123-4/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix bug where avatar filenames were not actually deleted from the database du...Stan Hu2015-05-073-4/+4
* | | | | | Merge branch 'note-role' into 'master'Dmitriy Zaporozhets2015-05-122-9/+28
|\ \ \ \ \ \
| * | | | | | Show user roles by comments.Douwe Maan2015-05-122-9/+28
* | | | | | | Merge branch 'rs-system-note' into 'master'Dmitriy Zaporozhets2015-05-128-235/+330
|\ \ \ \ \ \ \
| * | | | | | | Refactor SystemNoteService.cross_reference_disallowed?Robert Speicher2015-05-111-6/+13
| * | | | | | | Check if `system` is truthy in `Note.cross_reference?`Robert Speicher2015-05-111-1/+1