summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 7.11.0.rc2v7.11.0.rc2Job van der Voort2015-05-151-1/+1
|
* 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
* Version 7.11.0.rc1v7.11.0.rc1Job van der Voort2015-05-151-1/+1
|
* 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
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-1514-33/+50
|\
| * Merge branch 'dashboard-references' into 'master'Dmitriy Zaporozhets2015-05-1511-22/+30
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reference links in dashboard activity and ATOM feeds. References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations. This MR passes the project in question to the reference parsers in an option. cc @rspeicher See merge request !653
| | * Fix reference links in dashboard activity and ATOM feeds.dashboard-referencesDouwe Maan2015-05-1411-22/+30
| | |
| * | Merge branch 'spinner-spin' into 'master'Dmitriy Zaporozhets2015-05-152-6/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655
| | * | Spin icon next to "Checking for CI status..."spinner-spinDouwe Maan2015-05-142-6/+7
| | |/
| * | Merge branch 'use-count-badges' into 'master'Dmitriy Zaporozhets2015-05-152-5/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | Use count badges with number_with_delimiter helper for issue, commit count See merge request !658
| | * | 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 events
| * | | Fix bug with default timezone en RSS gitlab eventsJorge Vasquez2015-05-141-1/+1
| | | |
* | | | Fix gemfile.lockDmitriy Zaporozhets2015-05-151-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-148-12/+54
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'project_api_order' into 'master'Dmitriy Zaporozhets2015-05-143-1/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add order option for projects API https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !656
| | * | | update API docproject_api_orderValery Sizov2015-05-141-0/+3
| | | | |
| | * | | Add order option for projects APIValery Sizov2015-05-142-1/+15
| | | | |
| * | | | Merge branch 'rs-refactor-2fa' into 'master'Dmitriy Zaporozhets2015-05-142-9/+33
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor SessionsController to use a controller concern See merge request !659
| | * | | | Refactor SessionsController to use a controller concernrs-refactor-2faRobert Speicher2015-05-142-9/+33
| |/ / / /
| * | | | Merge branch 'fix-blob-path' into 'master'Douwe Maan2015-05-143-2/+3
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken view when viewing history of a file that includes a path that used to be another file Requires gitlab_git to v7.1.12 to be tagged and released. Closes #1598 See merge request !651
| | * | | Fix broken view when viewing history of a file that includes a path that ↵Stan Hu2015-05-133-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used to be another file Closes #1598
* | | | | Merge pull request #9295 from afc163/masterJeroen van Baarsen2015-05-142-0/+17
|\ \ \ \ \ | |/ / / / |/| | | | Add style for <kbd> element in markdown
| * | | | Add style for <kbd> element in markdownafc1632015-05-142-0/+17
|/ / / / | | | | | | | | | | | | Fixes #5825
* | | | Merge branch 'fewer-icons' into 'master'Dmitriy Zaporozhets2015-05-141-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use slightly fewer icons in project sidebar. ![Screen_Shot_2015-05-14_at_17.01.37](https://gitlab.com/gitlab-org/gitlab-ce/uploads/57928b7a0beb556f1e779d340b5e124f/Screen_Shot_2015-05-14_at_17.01.37.png) See merge request !657
| * | | | Use slightly fewer icons in project sidebar.Douwe Maan2015-05-141-6/+0
|/ / / /
* | | | Merge branch 'rs-relative-link-filter' into 'master'Dmitriy Zaporozhets2015-05-143-85/+94
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Minor RelativeLinkFilter cleanup See merge request !649
| * | | | Minor RelativeLinkFilter cleanuprs-relative-link-filterRobert Speicher2015-05-133-85/+94
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-146-32/+33
|\ \ \ \
| * \ \ \ Merge branch 'fix-group-mention' into 'master'Dmitriy Zaporozhets2015-05-143-3/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentioning of private groups. `issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326. See merge request !654
| | * | | Add changelog item.fix-group-mentionDouwe Maan2015-05-141-0/+1
| | | | |
| | * | | Fix mentioning of private groups.Douwe Maan2015-05-142-3/+3
| | | |/ | | |/|
| * | | Merge branch 'note-action-icons' into 'master'Dmitriy Zaporozhets2015-05-143-29/+29
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always show note action icons. As discussed in #639. The delete icon becomes red on hover, the edit one becomes slightly darker. The "Link here" icon has been removed, and the link to the specific comment can now be found by clicking the post date ("3 months ago"), which is most other sites do it as well. ![Screen_Shot_2015-05-14_at_12.18.50](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a204fa3a042659fa53fcb70d7143c8d1/Screen_Shot_2015-05-14_at_12.18.50.png) See merge request !652
| | * | Always show note action icons.Douwe Maan2015-05-143-29/+29
| |/ /
* | | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-147-8/+82
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
| * | Add reset_session for the :reset_session strategy.Douwe Maan2015-04-241-1/+5
| | |
| * | Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-247-9/+76
| | |
* | | Merge branch 'upgrade-dockerfile-apt' into 'master'Sytse Sijbrandij2015-05-142-15/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use apt repositories to upgrade Docker images to the latest versions Reduces the need to bump versions periodically. See merge request !647
| * | | Use apt repositories to upgrade Docker builds to the latest GitLab versionStan Hu2015-05-132-15/+12
| | |/ | |/| | | | | | | Reduces the need to bump versions periodically.
* | | GitLab shell version to 2.6.3.Marin Jankovski2015-05-141-1/+1
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-05-141-1/+1
|\ \ \ | |/ /
| * | Merge requests are welcome in spite of the deprecation.Sytse Sijbrandij2015-05-131-1/+1
| | |
* | | Merge branch 'sidekiq-sigkill' into 'master'Dmitriy Zaporozhets2015-05-132-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Use SIGKILL by default in Sidekiq::MemoryKiller This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM. See merge request !1824
| * | Use SIGKILL by default in Sidekiq::MemoryKillerJacob Vosmaer2015-05-132-1/+2
|/ / | | | | | | | | | | | | This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM.
* | Fix text overflow in project sidebarDmitriy Zaporozhets2015-05-131-0/+4
| |