summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler ↵Dosuken shinya2017-05-101-1/+1
| | | | from 3.1.10 to 3.4.0"
* Merge branch 'feature/print-go-version-in-env-info' into 'master' Sean McGivern2017-05-101-0/+3
|\ | | | | | | | | Print Go version in rake gitlab:env:info See merge request !11241
| * Print Go version in rake gitlab:env:infofeature/print-go-version-in-env-infoAhmad Sherif2017-05-101-0/+3
| |
* | Use relative paths for group/project/user avatarsblackst0ne2017-05-102-5/+16
|/
* Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-091-0/+4
|\ | | | | | | | | Don't use DiffCollection for deltas See merge request !11201
| * Don't use DiffCollection for deltasJacob Vosmaer2017-05-091-0/+4
| |
* | Remove some unused Gitlab::Git codeJacob Vosmaer2017-05-091-50/+0
| |
* | Merge request widget redesignFatih Acet2017-05-091-4/+4
| |
* | Add index_redirect_routes_path_for_link migration to setup_postgresql.rakeLuke "Jared" Bennett2017-05-081-0/+1
|/
* Add confirm delete protected branch modalSam Rose2017-05-082-27/+51
|
* Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-081-1/+0
|\ | | | | | | | | | | | | Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
| * remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-021-1/+0
| |
* | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-071-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
| * | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-1/+3
| | |
* | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-074-5/+6
|/ /
* | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵Kamil Trzciński2017-05-0612-33/+50
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
| * | Refine inheritance model of extended CI/CD statusesGrzegorz Bizon2017-05-059-32/+16
| | |
| * | Introduce generic manual action extended status classGrzegorz Bizon2017-05-053-6/+26
| | |
| * | Check ability to update build on the API resourceGrzegorz Bizon2017-05-052-5/+14
| | |
| * | Use update build policy instead of new play policyGrzegorz Bizon2017-05-051-1/+1
| | |
| * | Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-0516-52/+94
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits) Fixed Karma spec Reject EE reserved namespace paths in CE as well Updated webpack config Include the bundler:audit job into the static-analysis job Document serializers Add artifact file page that uses the blob viewer Pipeline table mini graph dropdown remains open when table is refreshed Adds off for event hub Compile gitlab-shell go executables Allow to create new branch and empty WIP merge request from issue page Moved to a view spec Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md Convert seconds to minutes and hours on chat notifations Disable navigation to Pages config if Pages is disabled Sort the network graph both by commit date and topographically. Add tooltips to note action buttons Add breadcrumb, build header and pipelines submenu to artifacts browser Update todos screenshots removes the possibility of commit messages having carriage returns Handle incoming emails from aliases correctly ...
| * \ \ Merge branch 'master' into ↵Grzegorz Bizon2017-05-0320-75/+510
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (103 commits) Include missing project attributes to Import/Export Create the rest of the wiki docs Fill in information about creating the wiki Home page Move wiki doc to its own index page Create initial file for Wiki documentation Default to null user when asignee is unselected Re-enable ref operations with gitaly after not-found fix #31560 Add repo parameter to gitaly:install and workhorse:install Remove N+1 queries when checking nodes visible to user Don't validate reserved words if the format doesn't match Revert "Shorten and improve some job names" Remove unused initializer DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml` Make the static-analysis job be run for docs branches too Add download_snippet_path helper Refresh the markdown cache if it was `nil` Add some documentation for the new migration helpers Update comments Display comments for personal snippets Update docs on creating a project ...
| * \ \ \ Merge branch 'master' into ↵Grzegorz Bizon2017-05-0255-254/+1242
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (314 commits) Better Explore Groups view Update Carrierwave and fog-core Add specs for Gitlab::RequestProfiler Add scripts/static-analysis to run all the static analysers in one go Shorten and improve some job names Group static-analysis jobs into a single job Don't blow up when email has no References header Update CHANGELOG.md for 9.1.2 Add changelog Add changelog Show Raw button as Download for binary files Use blob viewers for snippets Fix typo Fixed transient failure related to dropdown animations Revert "Merge branch 'tc-no-todo-service-select' into 'master'" fix link to MR 10416 Another change from .click -> .trigger('click') to make spec pass Change from .click -> .trigger('click') to make spec pass Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrations Add AddColumnWithDefaultToLargeTable cop ... Conflicts: spec/requests/api/jobs_spec.rb
| * | | | | Extend action tooltop to show info about abilitiesGrzegorz Bizon2017-05-011-1/+5
| | | | | |
| * | | | | Merge branch 'master' into ↵Grzegorz Bizon2017-04-2236-160/+299
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (274 commits) Update VERSION to 9.2.0-pre Update CHANGELOG.md for 9.1.0 Update Auto Deploy documentation Disable import URL field in New project form since it's hidden by default Remove reference to burndown charts since they don't exist for ce. Use master_password for Sentinel Refactor Discussions docs Start versioning cached markdown fields Refactor add_users method for project and group Improved the spec Now correctly tests against different forms Refactor environments components into vue files - part 3 Adding animation for all dropdown fix placeholder visibility submodule_links: handle urls that don't end with .git Add help regarding vue resource and where to include it Append .json to ajax endpoint to prevent browser to display raw json Fixed the preview keyboard shortcut focusing wrong tab Fix broken link Added new discussions docs Started on resolvable discussions docs ...
| * \ \ \ \ \ Merge branch 'master' into ↵Grzegorz Bizon2017-04-1384-441/+1814
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (641 commits) Revert "Fix registry for projects with uppercases in path" Fix registry for projects with uppercases in path Move event icons into events_helper Reset New branch button when issue state changes Add link to environments on kubernetes.md Indent system notes on desktop screens Improve webpack-dev-server compatibility with non-localhost setups. Add changelog entry Fix recent searches icon alignment in Safari Use preload to avoid Rails using JOIN Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error Prepare for zero downtime migrations Fix filtered search input width for IE Fix the `gitlab:gitlab_shell:check` task Fixed random failures with Poll spec Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates Let uses hide verbose output by default Separate examples for each other Collapse similar sibling scenarios Use empty_project for resources that are independent of the repo ... Conflicts: app/views/projects/ci/builds/_build.html.haml
| * | | | | | | Use build policy to determine if user can play buildGrzegorz Bizon2017-04-121-1/+1
| | | | | | | |
| * | | | | | | Do not show play action if user not allowed to run itGrzegorz Bizon2017-04-061-1/+1
| | | | | | | |
* | | | | | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-063-1/+39
| | | | | | | |
* | | | | | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-064-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
| * | | | | | | | Index redirect_routes path for LIKEMichael Kozono2017-05-051-0/+1
| | | | | | | | |
| * | | | | | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-053-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/fork-spec-mysql' into 'master' Stan Hu2017-05-061-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix fork_spec failure to do with mySQL Closes #31870 See merge request !11121
| * | | | | | | | | workaround spec failure for mySQL invalid date issuefix/fork-spec-mysqlJames Lopez2017-05-051-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Sean McGivern2017-05-056-79/+67
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master' Generate and handle a gl_repository param to pass around components Closes #29925 See merge request !10992
| * | | | | | | | | | Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ceAlejandro Rodríguez2017-05-053-3/+9
| | | | | | | | | | |
| * | | | | | | | | | Allow gl-repository strings as project identifiers in PostReceive workerAlejandro Rodríguez2017-05-051-26/+3
| | | | | | | | | | |
| * | | | | | | | | | Generate and handle a gl_repository param to pass around componentsAlejandro Rodríguez2017-05-034-51/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new param allows us to share project information between components that don't share or don't have access to the same filesystem mountpoints, for example between Gitaly and Rails or between Rails and Gitlab-Shell hooks. The previous parameters are still supported, but if found, gl_repository is prefered. The old parameters should be deprecated once all components support the new format.
* | | | | | | | | | | Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'Sean McGivern2017-05-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update Import/Export filesblackst0ne2017-05-051-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-0514-40/+74
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵Valery Sizov2017-05-0528-49/+217
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | skip]
| * | | | | | | | | | | [Multiple issue assignee] Fix a number of specsValery Sizov2017-05-051-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | [Multiple issue assignee]: reslving some conflictsValery Sizov2017-05-041-4/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-0413-38/+76
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-052-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sentry JS See merge request !6764
| * | | | | | | | | | | Review changesadd-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-051-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-05-046-12/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | Removed clientside_sentry ref in settings.rbLuke "Jared" Bennett2017-05-041-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Review changes, removed api/v3 updates as its frozen, removed the ↵Luke "Jared" Bennett2017-05-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clientside_sentry properties from the sensitive data filter as they\'re both available publically
View Lorry Controller Status