summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1392-520/+1155
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR reverting _mr_title.html.haml ...
| * | | | | | | | Add seperated 'describe' block for build trace specsTomasz Maczukin2016-01-131-7/+13
| | | | | | | | |
| * | | | | | | | Change :ci_build_canceled factory to :canceled traitTomasz Maczukin2016-01-132-5/+5
| | | | | | | | |
| * | | | | | | | Add some fixes after reviewTomasz Maczukin2016-01-134-51/+21
| | | | | | | | |
| * | | | | | | | Add some fixesTomasz Maczukin2016-01-122-2/+1
| | | | | | | | |
| * | | | | | | | Fix doc/api/builds.mdTomasz Maczukin2016-01-121-41/+19
| | | | | | | | |
| * | | | | | | | Fix :ci_build_with_trace factoryTomasz Maczukin2016-01-111-1/+3
| | | | | | | | |
| * | | | | | | | Add TODO notice to build trace feature in CI APITomasz Maczukin2016-01-111-0/+4
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-11298-1015/+3221
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (143 commits) Only load autocomplete data when actually needed Check for current user Add pencil icon to edit group settings Issue #5817 wording of the web hooks updated on issue and merge events use JavaScript instead of CoffeeScript in Views, the reason #9819 Before project save ensure that a runners_token exists Fix Error 500 when visiting build page of project with nil runners_token Remove outdated gitlab-git-http-server reference from Install doc Fix typo in build page of projects Update docs for shared runner default settings Disable "Already Blocked" button in admin abuse report page Add CHANGELOG entry for reply-by-email fix Use WOFF versions of SourceSansPro Clean up document on adding users to a project Refactor ZenMode Fix caching issue where build status was not updating in project dashboard Add a CHANGELOG entry for The Most Important Feature of All Time(TM) changes verb `references` to noun `reference`. fixes new branch button positioning, when visible and not visible container DRY up upload and download services ...
| * | | | | | | | | Update ./doc/api/builds.mdTomasz Maczukin2016-01-112-70/+234
| | | | | | | | | |
| * | | | | | | | | Change commit builds URL in builds APITomasz Maczukin2016-01-112-5/+5
| | | | | | | | | |
| * | | | | | | | | Add some modifications to builds API and specsTomasz Maczukin2016-01-082-5/+5
| | | | | | | | | |
| * | | | | | | | | Change test access level from MASTER to DEVELOPERTomasz Maczukin2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help us detect potential regressions in the future.
| * | | | | | | | | Modify entities for builds APITomasz Maczukin2016-01-083-25/+29
| | | | | | | | | |
| * | | | | | | | | Modify builds scope filtering in builds APITomasz Maczukin2016-01-084-16/+39
| | | | | | | | | |
| * | | | | | | | | Update ./doc/api/Tomasz Maczukin2016-01-053-1/+209
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-05115-1720/+1067
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (75 commits) Fix grammar Clarify the key generation step Remove misleading `ssh-dsa` markdown fixes markdown fixes Add `AbuseReport#notify` Make AbuseReportMailer responsible for knowing if it should deliver Redirect back to user profile page after abuse report Redesign the AbuseReports index Don't notify users twice if they are both project watchers and subscribers Restructure logo JS to use `setInterval` Decrease the logo sweep delay Correct the logo ID names Update CHANGELOG Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification Remove jquery.blockUI.js plugin rempves tests for "you have master access" text Revert "Merge branch 'rs-remove-jquery-blockui' into 'master' " removes footer message about access to project remove public field from namespace and refactoring ...
| * | | | | | | | | | Remove incorrect 'default' values from method descriptionTomasz Maczukin2015-12-311-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2015-12-30123-275/+3221
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (108 commits) Fix project transfer e-mail sending incorrect paths in e-mail notification Update CHANGELOG Use Gitlab::CurrentSettings for InfluxDB Write to InfluxDB directly via UDP Strip newlines from obfuscated SQL Add hotfix that allows to access build artifacts created before 8.3 note votes methids implementation When reCAPTCHA is disabled, allow registrations to go through without a code Downcased user or email search for avatar_icon. Handle missing settings table for metrics Fix broken link in permissions page [ci skip] reCAPTCHA is configurable through Admin Settings, no reload needed. Fixed syntax in gitlab.yml.example Move InfluxDB settings to ApplicationSetting Fix spelling mistake, thanks Connor. Restart settings are moved too. Hotfix for builds trace data integrity add issue weight to contributing Added host option for InfluxDB Fixed styling of MetricsWorker specs ...
| * | | | | | | | | | | Add cancel/retry features to builds APITomasz Maczukin2015-12-302-1/+65
| | | | | | | | | | | |
| * | | | | | | | | | | Add specs for build details/traces features in builds APITomasz Maczukin2015-12-302-2/+44
| | | | | | | | | | | |
| * | | | | | | | | | | Add specs for build listings in APITomasz Maczukin2015-12-292-3/+58
| | | | | | | | | | | |
| * | | | | | | | | | | Remove changes in 'paginate' helperTomasz Maczukin2015-12-281-4/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Add cancel/retry endpoints to build APITomasz Maczukin2015-12-281-0/+40
| | | | | | | | | | | |
| * | | | | | | | | | | Add 'not_found' notifications in build/trace detailsTomasz Maczukin2015-12-281-2/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Add endpoint for getting builds for a specific commitTomasz Maczukin2015-12-281-12/+26
| | | | | | | | | | | |
| * | | | | | | | | | | Modify build pagination to use 'paginate' helperTomasz Maczukin2015-12-282-6/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Add some fixes to builds APITomasz Maczukin2015-12-282-20/+27
| | | | | | | | | | | |
| * | | | | | | | | | | Fix example request urlTomasz Maczukin2015-12-241-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add builds API (listing, showing trace)Tomasz Maczukin2015-12-243-0/+95
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'add-pagination-headers-to-api' into 'master' Dmitriy Zaporozhets2016-01-145-12/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pagination headers to already paginated API resources Following #3045, I've added pagination headers using already available Kaminari methods. ## Pagination headers in action ![Screen_Shot_2016-01-14_at_12.14.53](/uploads/88807f754dd9aafbb24da85f6bdf9521/Screen_Shot_2016-01-14_at_12.14.53.png) --- I've also added a shared example to test paginated API resources. A possible next step would be to paginate all the API resources that return an array. See merge request !2426
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-14148-729/+2131
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-pagination-headers-to-api
| * | | | | | | | | | | | | Revert changes to how the notes are paginated in the APIRémy Coutable2016-01-141-3/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add pagination headers to already paginated API resourcesadd-pagination-headers-to-apiRémy Coutable2016-01-146-21/+52
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-1434-135/+633
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-1423-49/+452
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
| | * | | | | | | | | | | | | | Fix parse_gollum_tags matcherDouglas Barbosa Alexandre2016-01-141-2/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update documentation on Banzai::Filter::GollumTagsFilterDouglas Barbosa Alexandre2016-01-141-2/+38
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add tests for the wiki pipelineDouglas Barbosa Alexandre2016-01-144-5/+89
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Refactoring Banzai::Filter::GollumTagsFilterDouglas Barbosa Alexandre2016-01-142-23/+28
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatterDouglas Barbosa Alexandre2016-01-142-3/+3
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Remove GollumTagsPipelineDouglas Barbosa Alexandre2016-01-142-15/+4
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Refactoring Gitlab::GithubImport::ImporterDouglas Barbosa Alexandre2016-01-141-7/+13
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Remove unnecessary brackets on WIKI_SLUG_ID route constraintsDouglas Barbosa Alexandre2016-01-141-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Move js function to removing accents to vendor/assets/javascriptsDouglas Barbosa Alexandre2016-01-142-7/+14
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-01-141-0/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre2016-01-144-3/+26
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTMLDouglas Barbosa Alexandre2016-01-144-0/+210
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-146-36/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GitHub doesn’t apply these constraints to theirs wiki slug allowing characters like `,`, `:`, `*`, etc, we need to relax our constraints or some wiki pages will not be available after they were imported. For an example the Devise project have a wiki page with the following slug: “How To: Add sign_in, sign_out, and sign_up links to your layout template”
| | * | | | | | | | | | | | | | Import GitHub wiki into GitLabDouglas Barbosa Alexandre2016-01-144-1/+56
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
View Lorry Controller Status