summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Add order option for projects APIValery Sizov2015-05-141-1/+6
* 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
| * | | Remove all references to `parse_tasks`Robert Speicher2015-05-061-28/+3
| * | | Add TaskList::Filter to pipelineRobert Speicher2015-05-061-4/+7
| |/ /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-081-1/+1
|\ \ \
| * | | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-061-1/+1
| |/ /
* | | Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env varJacob Vosmaer2015-05-071-5/+6
|/ /
* | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-061-1/+1
* | Update authentication.rbquodos2015-05-041-1/+1
* | Add current_sign_in_at to api UserSven Selberg2015-05-041-1/+1
* | Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into jubianch...Dmitriy Zaporozhets2015-05-033-5/+18
|\ \
| * | Query issues, merge requests and milestones with their IID through APIjubianchi2015-05-023-5/+18
* | | Merge pull request #9066 from jirutka/fix-6417Dmitriy Zaporozhets2015-05-031-2/+2
|\ \ \
| * | | Fix #6417: users with group permission should be able to create groups via APIRobert Schilling2015-03-311-2/+2
* | | | Merge pull request #8756 from zaburt/force_utf8_on_oauth_propertiesDmitriy Zaporozhets2015-05-032-7/+16
|\ \ \ \
| * | | | add common method to force utf8 and force oauth properties to be utf8Onur Küçük2015-05-032-7/+16
| | |/ / | |/| |
* | | | Remove title_for_issue helperRobert Speicher2015-04-301-5/+1
* | | | Remove special handling for the `'` problemRobert Speicher2015-04-302-13/+1
* | | | Add Project#get_issueRobert Speicher2015-04-301-7/+6
* | | | Rename SCHEME_PATTERN to LINK_PATTERNRobert Speicher2015-04-301-5/+5
* | | | Autolink short URLsRobert Speicher2015-04-301-1/+4
* | | | Update Autolink SCHEME_PATTERNRobert Speicher2015-04-301-1/+3
* | | | Doc typoRobert Speicher2015-04-301-1/+1
* | | | Escape normal text in our Redcarpet rendererRobert Speicher2015-04-301-1/+3
View Lorry Controller Status