summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'get-monkey-off-my-rack-attack' into 'master'Douwe Maan2015-05-262-32/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Rack Attack monkey patches and bump to version 4.3.0 I finally got these monkey patches into Rack Attack v4.3.0, so GitLab no longer needs them. Hooray! See: https://github.com/kickstarter/rack-attack/pull/128 See merge request !693
| * | | | Remove Rack Attack monkey patches and bump to version 4.3.0Stan Hu2015-05-222-32/+0
| | |/ / | |/| |
* | | | Add support for Webhook note eventsStan Hu2015-05-211-2/+4
|/ / / | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745
* | | Customize the sanitization whitelist only oncers-issue-1651Robert Speicher2015-05-201-13/+22
| | | | | | | | | | | | Fixes #1651
* | | Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-202-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ↵Marin Jankovski2015-05-191-1/+1
|\ \ \ | | | | | | | | | | | | jirutka-shell-secret-path
| * | | Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-161-1/+1
| | | |
* | | | Simplify and unify helpers for rendering markupJakub Jirutka2015-05-181-3/+5
| | | |
* | | | Rename MarkdownHelper to MarkupHelperJakub Jirutka2015-05-181-1/+1
| | | |
* | | | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)Jakub Jirutka2015-05-182-1/+70
| | | |
* | | | Add search issues/MR by numberNikita Verkhovin2015-05-181-2/+14
|/ / /
* | | Ensure that the first added admin performs repository importsFotis Gimian2015-05-151-1/+1
| | |
* | | Merge branch 'dashboard-references' into 'master'Dmitriy Zaporozhets2015-05-152-8/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-8/+13
| | | |
* | | | Merge branch 'project_api_order' into 'master'Dmitriy Zaporozhets2015-05-141-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add order option for projects API https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !656
| * | | | Add order option for projects APIValery Sizov2015-05-141-1/+6
| |/ / /
* | | | Merge branch 'rs-relative-link-filter' into 'master'Dmitriy Zaporozhets2015-05-142-17/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Minor RelativeLinkFilter cleanup See merge request !649
| * | | | Minor RelativeLinkFilter cleanuprs-relative-link-filterRobert Speicher2015-05-132-17/+31
| | | | |
* | | | | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-141-0/+66
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-0/+62
| | | | |
* | | | | Use SIGKILL by default in Sidekiq::MemoryKillerJacob Vosmaer2015-05-131-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-135-50/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-2/+3
| | | | |
| * | | | Improve OAuth signup error message.Douwe Maan2015-05-131-2/+2
| | | | |
| * | | | Improve description of branch protection levels.Douwe Maan2015-05-131-3/+3
| | | | |
| * | | | Improve Git access error messages.Douwe Maan2015-05-133-45/+44
| | | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-133-5/+122
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9276 from jirutka/relative_link_filterDmitriy Zaporozhets2015-05-133-5/+122
| |\ \ \ \ \ | | |/ / / / | |/| | | | Extract handling of relative file links to its own HTML filter
| | * | | | RelativeLinkFilter: refactor according to suggestions by @tsigoJakub Jirutka2015-05-112-17/+13
| | | | | |
| | * | | | Extract handling of relative file links to RelativeLinkFilterJakub Jirutka2015-05-113-5/+126
| | | | | |
* | | | | | Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-131-0/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Version check See merge request !1509
| * | | | | Replace host with real oneDmitriy Zaporozhets2015-05-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-081-0/+19
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Remove encryptionDmitriy Zaporozhets2015-05-081-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Add version check badge to admin areaDmitriy Zaporozhets2015-03-091-0/+30
| | | | | |
* | | | | | Merge branch 'ad-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-05-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638
| * | | | | | Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_usersDouwe Maan2015-05-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'brakeman-level'Dmitriy Zaporozhets2015-05-121-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: lib/tasks/brakeman.rake
| * | | | | | We would like to pass 'brakeman -w2'Jacob Vosmaer2015-05-111-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Follow shell command guidelines in Brakeman taskJacob Vosmaer2015-05-111-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | There is no real issue here because the shell command is completely static, but it is still nicer to just follow the guidelines in doc/development/shell_commands.md .
* | | | | Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-081-2/+17
| | | | |
* | | | | Merge pull request #9214 from Bugagazavr/hook-eventsValeriy Sizov2015-05-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Added X-GitLab-Event header for web hooks
| * | | | Added X-GitLab-Event header for web hooksbugagazavr2015-05-081-1/+1
| | | | |
* | | | | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-083-30/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599
| * | | | | Update Markdown help docs for latest changesRobert Speicher2015-05-061-1/+1
| | | | | |
| * | | | | Remove 'jasmine' gemRobert Speicher2015-05-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jasmine-rails still requires it as a dependency, but for some reason running `rake jasmine:ci` produced test failures but `rake spec:javascript` didn't.
| * | | | | Remove all references to `parse_tasks`Robert Speicher2015-05-061-28/+3
| | | | | |
| * | | | | Add TaskList::Filter to pipelineRobert Speicher2015-05-061-4/+7
| |/ / / /
View Lorry Controller Status