summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' into ↵Grzegorz Bizon2017-04-22816-8749/+12547
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131010-9279/+23975
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Fix detailed build status specs for manual actionsGrzegorz Bizon2017-04-131-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix manual action entity specsGrzegorz Bizon2017-04-121-1/+2
| | | | | | | | | |
| * | | | | | | | | Use build policy to determine if user can play buildGrzegorz Bizon2017-04-129-69/+6
| | | | | | | | | |
| * | | | | | | | | Extract build play specs and extend test examplesGrzegorz Bizon2017-04-122-34/+107
| | | | | | | | | |
| * | | | | | | | | Do not inherit build policy in pipeline policyGrzegorz Bizon2017-04-122-1/+8
| | | | | | | | | |
| * | | | | | | | | Move code for playing an action to separate serviceGrzegorz Bizon2017-04-123-13/+21
| | | | | | | | | |
| * | | | | | | | | Implement new rule for manual actions in policiesGrzegorz Bizon2017-04-122-0/+67
| | | | | | | | | |
| * | | | | | | | | Check branch permission in manual action entityGrzegorz Bizon2017-04-061-0/+8
| | | | | | | | | |
| * | | | | | | | | Check if user can trigger manual action in the UIGrzegorz Bizon2017-04-061-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix specs for build status factory and manual statusGrzegorz Bizon2017-04-061-1/+16
| | | | | | | | | |
| * | | | | | | | | Take branch access into account when stopping environmentGrzegorz Bizon2017-04-066-7/+58
| | | | | | | | | |
| * | | | | | | | | Fix specs related to new manual actions permissionsGrzegorz Bizon2017-04-064-14/+54
| | | | | | | | | |
| * | | | | | | | | Fix chatops specs with incorrectly defined projectGrzegorz Bizon2017-04-062-10/+20
| | | | | | | | | |
| * | | | | | | | | Do not show play action if user not allowed to run itGrzegorz Bizon2017-04-062-3/+11
| | | | | | | | | |
| * | | | | | | | | Expose manual action abilities from a build entityGrzegorz Bizon2017-04-062-5/+33
| | | | | | | | | |
| * | | | | | | | | Check branch access when user triggers manual actionGrzegorz Bizon2017-04-062-12/+63
| | | | | | | | | |
| * | | | | | | | | Improve specs related to CI/CD job environmentGrzegorz Bizon2017-04-061-8/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix/gb/hide-environment-external-url-btn-when-not-provided' ↵Kamil Trzciński2017-05-063-2/+39
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Hide environment external URL button if not defined Closes #30832 See merge request !11029
| * \ \ \ \ \ \ \ \ \ Merge commit '3a2b60f7a' from 'master'fix/gb/hide-environment-external-url-btn-when-not-providedGrzegorz Bizon2017-05-05529-2804/+12994
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (254 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 ...
| * | | | | | | | | | Add changelog entry for external env URL btn fixGrzegorz Bizon2017-05-021-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Hide environment external URL button if not definedGrzegorz Bizon2017-05-022-2/+35
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pages-0.4.2' into 'master' Kamil Trzciński2017-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GitLab Pages v0.4.2 See merge request !11131
| * | | | | | | | | | Use GitLab Pages v0.4.2pages-0.4.2Nick Thomas2017-05-051-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'zj-real-time-pipelines' into 'master' Kamil Trzciński2017-05-0617-11/+637
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Real time pipeline show action Closes #25226 See merge request !10777
| | | | | | | | | * | | Fix broken css classFilipa Lacerda2017-05-061-2/+2
| | | | | | | | | | | |
| | | | | | | | | * | | Single commit squash of all changes for ↵Kamil Trzcinski2017-05-0640-294/+1321
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878 It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.
| * | | | | | | | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-0617-11/+637
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-routable-find-by-full-path-on-mysql' into 'master' Sean McGivern2017-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `Routable.find_by_full_path` on MySQL See merge request !11146
| * | | | | | | | | | Fix `Routable.find_by_full_path` on MySQLfix-routable-find-by-full-path-on-mysqlSean McGivern2017-05-061-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '23751-add-contribution-graph-key-tooltips' into 'master' Filipa Lacerda2017-05-062-9/+21
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tooltips to user contribution graph key Closes #23751 See merge request !11138
| * | | | | | | | | | add CHANGELOG.md entry for !1113823751-add-contribution-graph-key-tooltipsMike Greiling2017-05-051-0/+4
| | | | | | | | | | |
| * | | | | | | | | | add tooltips to user contrib graph keyMike Greiling2017-05-051-9/+17
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-0636-162/+1207
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
| * | | | | | | | | | Reduce risk of deadlocks17361-redirect-renamed-pathsMichael Kozono2017-05-052-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We’ve seen a deadlock in CI here https://gitlab.com/mkozono/gitlab-ce/builds/15644492#down-build-trace. This commit should not fix that particular failure, but perhaps it will avoid others. * Don’t call delete_conflicting_redirects after update if the path wasn’t changed * Rename descendants without using recursion again, so we can run delete_conflicting_redirects exactly once.
| * | | | | | | | | | Resolve discussionsMichael Kozono2017-05-052-7/+6
| | | | | | | | | | |
| * | | | | | | | | | Resolve discussionsMichael Kozono2017-05-058-25/+31
| | | | | | | | | | |
| * | | | | | | | | | Dry up routable lookups. Fixes #30317Michael Kozono2017-05-055-55/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: This changes the behavior of user lookups (see the spec change) so it acts the same way as groups and projects. Unauthenticated clients attempting to access a user page will be redirected to login whether the user exists and is publicly restricted, or does not exist at all.
| * | | | | | | | | | Add “project moved” flash message on redirectMichael Kozono2017-05-054-0/+9
| | | | | | | | | | |
| * | | | | | | | | | Resolve discussionsMichael Kozono2017-05-055-23/+42
| | | | | | | | | | |
| * | | | | | | | | | Fix Rubocop failuresMichael Kozono2017-05-053-7/+6
| | | | | | | | | | |
| * | | | | | | | | | Index redirect_routes path for LIKEMichael Kozono2017-05-053-0/+31
| | | | | | | | | | |
| * | | | | | | | | | Add index for source association and for pathMichael Kozono2017-05-052-1/+26
| | | | | | | | | | |
| * | | | | | | | | | Fix or workaround spec failureMichael Kozono2017-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why this fixes this error: ``` ActiveRecord::RecordNotUnique:  PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "index_routes_on_source_type_and_source_id"  DETAIL: Key (source_type, source_id)=(Project, 1) already exists.  : INSERT INTO "routes" ("source_type", "path", "name", "source_id", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id" ```
| * | | | | | | | | | RefactorMichael Kozono2017-05-052-9/+9
| | | | | | | | | | |
| * | | | | | | | | | Delete conflicting redirectsMichael Kozono2017-05-054-20/+127
| | | | | | | | | | |
| * | | | | | | | | | Create redirect routes on path changeMichael Kozono2017-05-052-8/+50
| | | | | | | | | | |
| * | | | | | | | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-0530-87/+668
| | | | | | | | | | |
| * | | | | | | | | | Add happy path feature tests for redirect behaviorMichael Kozono2017-05-053-28/+255
| | | | | | | | | | |
View Lorry Controller Status