Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix a broken link for the "How to Configure LDAP with GitLab EE" articledocs/fix-broken-link | Rémy Coutable | 2017-05-05 | 1 | -1/+1 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch '30237-pipelines-actions-make-2-requests' into 'master' | Kamil Trzciński | 2017-05-05 | 3 | -3/+53 |
|\ | | | | | | | | | | | | | Resolve: "Pipelines: When we retry a pipeline 2 requests are made to the pipelines endpoint" Closes #30237 See merge request !10584 | ||||
| * | Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requests | Grzegorz Bizon | 2017-05-05 | 1 | -0/+36 |
| | | |||||
| * | Use wrap_parameters in pipelines controller | Grzegorz Bizon | 2017-05-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to workaround a bug in `safe_constantize` which caused a `LoadError` exception when doing ``` "Pipeline".safe_constantize LoadError: Unable to autoload constant Pipeline, expected /home/grzesiek/gdk/gitlab/app/models/ci/pipeline.rb to define it ``` See https://github.com/rails/rails/issues/28854 for more details. | ||||
| * | Respond with no content for pipeline JSON actions | Grzegorz Bizon | 2017-05-05 | 1 | -6/+2 |
| | | |||||
| * | Retry and cancel endpoints send 204 json response. Request is made with type ↵ | Filipa Lacerda | 2017-05-05 | 2 | -3/+19 |
| | | | | | | | | json | ||||
* | | Merge branch 'merge-request-poll-json-endpoint' into 'master' | Filipa Lacerda | 2017-05-05 | 2 | -1/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | Fixed bug where merge request JSON would show Closes #28909 See merge request !11096 | ||||
| * | | Fixed bug where merge request JSON would showmerge-request-poll-json-endpoint | Phil Hughes | 2017-05-04 | 2 | -1/+5 |
| | | | | | | | | | | | | Closes #28909 | ||||
* | | | Merge branch 'adam-separate-slash-commands' into 'master' | Rémy Coutable | 2017-05-05 | 28 | -133/+785 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Display slash commands outcome when previewing Markdown Closes #21531 See merge request !10054 | ||||
| * | | | Display slash commands outcome when previewing Markdownadam-separate-slash-commands | Rares Sfirlogea | 2017-05-04 | 28 | -133/+785 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove slash commands from Markdown preview and display their outcome next to the text field. Introduce new "explanation" block to our slash commands DSL. Introduce optional "parse_params" block to slash commands DSL that allows to process a parameter before it is passed to "explanation" or "command" blocks. Pass path for previewing Markdown as "data" attribute instead of setting a variable on "window". | ||||
* | | | | Merge branch '31552-documentation-dos-and-donts' into 'master' | Phil Hughes | 2017-05-05 | 2 | -283/+334 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Documentation: Frontend list of do's and don'ts" Closes #31552 See merge request !11091 | ||||
| * | | | | Changes after review31552-documentation-dos-and-donts | Filipa Lacerda | 2017-05-04 | 1 | -19/+13 |
| | | | | | |||||
| * | | | | Add missing points | Filipa Lacerda | 2017-05-04 | 1 | -8/+70 |
| | | | | | |||||
| * | | | | Adds numbered lists to easily point to documentation | Filipa Lacerda | 2017-05-04 | 2 | -282/+277 |
| | | | | | |||||
* | | | | | Merge branch 'manual-build-trigger' into 'master' | Marin Jankovski | 2017-05-05 | 3 | -0/+59 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a manual job to trigger package build in omnibus Closes omnibus-gitlab#2234 See merge request !11086 | ||||
| * | | | | | Add a manual job to trigger package build in omnibus | Balasankar C | 2017-05-05 | 3 | -0/+59 |
|/ / / / / | |||||
* | | | | | Merge branch '29145-oauth-422' into 'master' | Phil Hughes | 2017-05-05 | 5 | -12/+143 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update design of auth error page Closes #29145 See merge request !11099 | ||||
| * | | | | | Update design of auth error page | Annabel Dunstone Gray | 2017-05-05 | 5 | -12/+143 |
|/ / / / / | |||||
* | | | | | Merge branch '31810-commit-link' into 'master' | Phil Hughes | 2017-05-05 | 2 | -1/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove # char for commit Closes #31810 See merge request !11093 | ||||
| * | | | | | Remove # char for commit | Filipa Lacerda | 2017-05-05 | 2 | -1/+5 |
|/ / / / / | |||||
* | | | | | Merge branch '28433-internationalise-cycle-analytics-page' into 'master' | Douwe Maan | 2017-05-05 | 69 | -81/+1829 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalise Cycle Analytics page Closes #28433 See merge request !10669 | ||||
| * | | | | | Some small updates for Spanish translations. | Ruben Davila | 2017-05-04 | 10 | -32/+32 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-04 | 395 | -1955/+9430 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb | ||||
* | | | | | | Merge branch 'dm-fix-cycle-analytics-stage-legends' into 'master' | Robert Speicher | 2017-05-04 | 3 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wording of Cycle Analytics stage legends See merge request !11106 | ||||
| * | | | | | | Fix wording of Cycle Analytics stage legends | Douwe Maan | 2017-05-04 | 3 | -3/+3 |
|/ / / / / / | |||||
* | | | | | | Merge branch '2274-store-last-repository-updated-at-ce' into 'master' | Robert Speicher | 2017-05-04 | 10 | -16/+95 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of "2274-store-last-repository-updated-at" to CE See merge request !11085 | ||||
| * | | | | | | Fix Import/Export configuration spec2274-store-last-repository-updated-at-ce | Douglas Barbosa Alexandre | 2017-05-04 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Update last_repository_updated_at when the wiki is updated | Douglas Barbosa Alexandre | 2017-05-04 | 2 | -7/+16 |
| | | | | | | | |||||
| * | | | | | | Update last_repository_updated_at when a push event is created | Douglas Barbosa Alexandre | 2017-05-04 | 2 | -8/+40 |
| | | | | | | | |||||
| * | | | | | | Set last_repository_updated_at to created_at upon project creation | Douglas Barbosa Alexandre | 2017-05-04 | 2 | -0/+13 |
| | | | | | | | |||||
| * | | | | | | Add index to last_repository_updated_at on projects | Douglas Barbosa Alexandre | 2017-05-04 | 2 | -1/+17 |
| | | | | | | | |||||
| * | | | | | | Add last_repository_updated_at to projects | Douglas Barbosa Alexandre | 2017-05-04 | 2 | -1/+9 |
| | | | | | | | |||||
* | | | | | | | Merge branch '30329-web-gui-unable-to-create-new-branch-from-commit-sha' ↵ | Jacob Schatz | 2017-05-04 | 5 | -9/+75 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Web GUI: Unable to create new branch from commit SHA" Closes #30329 See merge request !10738 | ||||
| * | | | | | | Resolve "Web GUI: Unable to create new branch from commit SHA" | Luke "Jared" Bennett | 2017-05-04 | 5 | -9/+75 |
|/ / / / / / | |||||
* | | | | | | Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master' | Jacob Schatz | 2017-05-04 | 4 | -3/+51 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR target branch select dropdown placement cut-off Closes #31271 See merge request !10902 | ||||
| * | | | | | Fix MR target branch selector dropdown placement cut-off31271-fixmr-target-branch-selector-dropdown | Eric Eastwood | 2017-05-01 | 4 | -3/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31271 When the dropdown items are too wide, constrain the dropdown to the offsetParent. Otherwise, let it naturally flow as Select2 wants. | ||||
* | | | | | | Merge branch 'deploy-keys-load-async' into 'master' | Filipa Lacerda | 2017-05-04 | 27 | -37/+961 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy keys load async Closes #29667 See merge request !10973 | ||||
| * | | | | | | Fixed Karma specdeploy-keys-load-async | Phil Hughes | 2017-05-04 | 2 | -4/+13 |
| | | | | | | | |||||
| * | | | | | | Updated webpack config | Phil Hughes | 2017-05-04 | 2 | -5/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-04 | 203 | -1298/+4346 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Fixed karma specs | Phil Hughes | 2017-05-03 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-03 | 472 | -2184/+8995 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Component specs | Phil Hughes | 2017-05-02 | 6 | -6/+237 |
| | | | | | | | | |||||
| * | | | | | | | Started specs [ci skip] | Phil Hughes | 2017-05-02 | 3 | -1/+166 |
| | | | | | | | | |||||
| * | | | | | | | Fixed some spinach & rspec tests | Phil Hughes | 2017-04-28 | 5 | -13/+32 |
| | | | | | | | | |||||
| * | | | | | | | Updated some Vue specific JS | Phil Hughes | 2017-04-28 | 7 | -16/+13 |
| | | | | | | | | |||||
| * | | | | | | | Fixed public keys always rendering even when empty | Phil Hughes | 2017-04-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Re-wrote to match our docs - still not 100% sure but closer than it was | Phil Hughes | 2017-04-28 | 15 | -115/+384 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-04-28 | 117 | -408/+2700 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add timeago | Jacob Schatz | 2017-04-27 | 1 | -2/+6 |
| | | | | | | | | |