summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
| |
* | Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-1314-84/+98
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Batch 1 of text improvements Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved. This batch includes: - Improve text on error pages. - Improve Git access error messages. - Improve description of branch protection levels. - Improve OAuth signup error message. - Improve OAuth application flash messages. cc @rspeicher See merge request !642
| * | Fix GitAccess.text-batch-1Douwe Maan2015-05-132-13/+6
| | |
| * | Fix 422 error page.Douwe Maan2015-05-131-1/+1
| | |
| * | Improve OAuth application flash messages.Douwe Maan2015-05-131-5/+5
| | |
| * | Improve OAuth signup error message.Douwe Maan2015-05-132-4/+11
| | |
| * | Improve description of branch protection levels.Douwe Maan2015-05-131-3/+3
| | |
| * | Improve Git access error messages.Douwe Maan2015-05-133-45/+44
| | |
| * | Improve text on error pages.Douwe Maan2015-05-136-17/+32
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-131-6/+15
|\ \ \
| * | | remove strange code branchetsSytse Sijbrandij2015-05-131-1/+1
| | | |
| * | | Deprecate the upgrader script since we forget to update it.Sytse Sijbrandij2015-05-131-5/+14
| | | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-1310-221/+275
|\ \ \ \
| * \ \ \ Merge pull request #9276 from jirutka/relative_link_filterDmitriy Zaporozhets2015-05-136-218/+242
| |\ \ \ \ | | | | | | | | | | | | Extract handling of relative file links to its own HTML filter
| | * | | | Add spec for RelativeLinkFilterJakub Jirutka2015-05-122-73/+120
| | | | | |
| | * | | | RelativeLinkFilter: refactor according to suggestions by @tsigoJakub Jirutka2015-05-112-17/+13
| | | | | |
| | * | | | Extract handling of relative file links to RelativeLinkFilterJakub Jirutka2015-05-114-145/+126
| | | | | |
| * | | | | Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commitJeroen van Baarsen2015-05-134-3/+33
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Call merge request web hook for each commits
| | * | | | Call merge request web hook for each commitsArthur Gautier2015-05-134-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call merge request web hook every times a new commit hits the source branch Signed-off-by: Arthur Gautier <baloo@gandi.net>
* | | | | | Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-139-10/+46
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Version check See merge request !1509
| * | | | | Enable version check only for production environmentDmitriy Zaporozhets2015-05-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Replace host with real oneDmitriy Zaporozhets2015-05-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix syntax errorDmitriy Zaporozhets2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-089-10/+45
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb
| | * | | | | Remove unnecessary public keyDmitriy Zaporozhets2015-05-082-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | Remove encryptionDmitriy Zaporozhets2015-05-084-24/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | Add feature to disable version checkDmitriy Zaporozhets2015-03-106-5/+20
| | | | | | |