summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| |/
* | 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
|/ | | | | | | It looks like SIGTERM may not be enough to shut down a Sidekiq process when its RSS has gotten too big. This change will allow us to experiment with sending SIGKILL instead of SIGTERM to Sidekiq processes on gitlab.com.
* Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-061-1/+1
|
* Update authentication.rbquodos2015-05-041-1/+1
| | | correct spelling
* Add current_sign_in_at to api UserSven Selberg2015-05-041-1/+1
|
* Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into ↵Dmitriy Zaporozhets2015-05-033-5/+18
|\ | | | | | | jubianchi-api-iid
| * 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 API
| * | 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 utf8
| * | | 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
| | | | | | | | | | | | | | | | | | While `escape_once` will create this HTML entity, Nokogiri always translates it back before it gets to IssueReferenceFilter, so there should be no danger of erroneous issue links.
* | | 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
| | |
* | | Update the Gitlab::Markdown docsRobert Speicher2015-04-301-25/+1
| | |
* | | Add Gitlab::Markdown::SanitizationFilterRobert Speicher2015-04-302-31/+41
| | | | | | | | | | | | | | | This just extends the HTML::Pipeline::SanitizationFilter with our custom whitelist.
* | | Add Gitlab::Markdown::AutolinkFilterRobert Speicher2015-04-303-14/+103
| | |
* | | Add Gitlab::Markdown::TableOfContentsFilterRobert Speicher2015-04-303-10/+67
| | | | | | | | | | | | Removes header and table of contents processing from Redcarpet renderer.
* | | Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-301-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show incompatible projects in Google Code import status Using Google Code import with a JSON file that contained only one Subversion project led to confusion over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion. Closes #1531 ## Screenshots Before: ![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png) After with no projects available (notice the button is hidden): ![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png) After with 1 valid and 1 incompatible project: ![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png) See merge request !586
| * | Show incompatible projects in Google Code import statusStan Hu2015-04-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Importing a JSON file with only one Subversion project lead to confusion over whether the system was working. Provide status why these projects could not be imported directly. Closes #1531
* | | Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-2/+2
|/ /
* | Merge pull request #8677 from jubianchi/api-500-jsonJeroen van Baarsen2015-04-281-1/+1
|\ \ | | | | | | Send 500 errors as JSON in the API
| * | Send 500 errors as JSON in the APIjubianchi2015-04-271-1/+1
| | |
* | | Add a rake task to automatically restart foreman when changes occurjubianchi2015-04-271-0/+5
|/ /
* | Merge pull request #8754 from jirutka/fix-project_name_regexJeroen van Baarsen2015-04-271-4/+4
|\ \ | | | | | | Fix (project_)name_regex to accept non-ASCII letters and dash
| * | Fix (project_)name_regex to accept non-ASCII letters and dashJakub Jirutka2015-04-271-4/+4
| | |
* | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-1/+1
|/ / | | | | | | This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
View Lorry Controller Status