summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-issue-1690' into 'master'Dmitriy Zaporozhets2015-05-261-3/+3
|\
| * Better handle label references that aren't actually referencesrs-issue-1690Robert Speicher2015-05-251-3/+3
* | 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.0Stan Hu2015-05-222-32/+0
* | Add support for Webhook note eventsStan Hu2015-05-211-2/+4
|/
* Customize the sanitization whitelist only oncers-issue-1651Robert Speicher2015-05-201-13/+22
* Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-202-2/+25
* Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ...Marin Jankovski2015-05-191-1/+1
|\
| * 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.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 APIValery Sizov2015-05-141-1/+6
| |/
* | Merge branch 'rs-relative-link-filter' into 'master'Dmitriy Zaporozhets2015-05-142-17/+31
|\ \
| * | Minor RelativeLinkFilter cleanuprs-relative-link-filterRobert Speicher2015-05-132-17/+31
* | | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-141-0/+66
|\ \ \ | |_|/ |/| |
| * | 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
| |/ |/|
* | Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-135-50/+50
|\ \
| * | 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
| |\ \ \ | | |/ / | |/| |
| | * | 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
|\ \ \ \ | |/ / / |/| | |
| * | | Replace host with real oneDmitriy Zaporozhets2015-05-111-2/+1
| * | | Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-081-0/+19
| |\ \ \
| | * | | Remove unnecessary public keyDmitriy Zaporozhets2015-05-081-0/+1
| | * | | Remove encryptionDmitriy Zaporozhets2015-05-081-18/+6
| | * | | 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.ad-block_auto_created_usersDouwe Maan2015-05-121-1/+1
* | | | | | Merge branch 'brakeman-level'Dmitriy Zaporozhets2015-05-121-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|/ / / /
* | | | 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 hooksbugagazavr2015-05-081-1/+1
* | | | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-083-30/+20
|\ \ \ \
| * | | | Update Markdown help docs for latest changesRobert Speicher2015-05-061-1/+1
| * | | | Remove 'jasmine' gemRobert Speicher2015-05-061-0/+12
View Lorry Controller Status