summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'winh-styled-people-search-bar' into 'master'Tim Zallmann2017-06-021-2/+2
|\ | | | | | | | | | | | | Style people in issuable search bar Closes #30468 See merge request !11402
| * Move clear search button out of issuable search barwinh2017-06-021-2/+2
| |
* | Use throttle when window is resizedFilipa Lacerda2017-06-021-3/+0
| |
* | Merge branch 'blameless' into 'master'Rémy Coutable2017-06-022-2/+2
|\ \ | | | | | | | | | | | | Promote blameless culture by using "annotate" instead See merge request !10378
| * | Promote blameless culture by using "annotate" insteadIlya Vassilevsky2017-06-022-2/+2
| | | | | | | | | | | | User-facing changes (fast & easy win)
* | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-022-7/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
| * | | Minor refactor based on review feedbackkushalpandya2017-06-021-1/+1
| | | |
| * | | Address review comments31511-jira-settingsJarka Kadlecova2017-06-021-2/+2
| | | |
| * | | Update as per reviewkushalpandya2017-06-011-1/+1
| | | |
| * | | Provide `test-url` via backendkushalpandya2017-06-011-1/+1
| | | |
| * | | Fix class name typokushalpandya2017-06-011-1/+1
| | | |
| * | | Use `@service.can_test?` to enable test before savekushalpandya2017-06-011-1/+1
| | | |
| * | | Remove test settings button, enhance Save changes button, include ↵kushalpandya2017-06-011-3/+8
| | | | | | | | | | | | | | | | Integrations bundle
| * | | Add support for required input validationkushalpandya2017-06-011-3/+3
| | | |
| * | | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-011-0/+1
| | | |
* | | | Pipeline show view real time header sectionFilipa Lacerda2017-06-021-15/+1
| |_|/ |/| |
* | | Merge branch '33207-show-delete-option-in-admin-users-page' into 'master'Grzegorz Bizon2017-06-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow admins to delete users from the admin users page Closes #33207 See merge request !11852
| * | | Allow admins to delete users from the admin users pageNick Thomas2017-06-011-1/+1
| | | |
* | | | Show current user immediately in issuable filtersWinnie Hellmann2017-06-022-16/+24
| |_|/ |/| |
* | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-014-3/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Implementation for protected variables Closes #24196 See merge request !11688
| * \ \ Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-0124-47/+46
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
| * | | Update docs and use protected secret variable as the nameLin Jen-Shin2017-05-312-3/+4
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-3122-97/+126
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (89 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| * \ \ \ Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-2650-256/+402
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Add docs for protected variablesLin Jen-Shin2017-05-251-1/+1
| | | | | |
| * | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-253-1/+13
| | | | | |
* | | | | | Resolve "Improve Container Registry description"Achilleas Pipinellis2017-06-011-19/+53
| | | | | |
* | | | | | Merge branch 'dm-fix-jump-button' into 'master'Fatih Acet2017-06-011-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Fix title of discussion jump button at top of page See merge request !11768
| * | | | | Fix title of discussion jump button at top of pagedm-fix-jump-buttonDouwe Maan2017-05-261-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch ↵Rémy Coutable2017-06-011-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard' into 'master' Display Shared Runner status in Admin Dashboard Closes #31602 See merge request !11783
| * | | | | Display Shared Runner status in Admin Dashboardvanadium232017-05-311-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802
| * | | | | Fix: A diff comment on a change at last line of a file shows as two comments ↵Valery Sizov2017-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | in discussion
* | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-012-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Consistent diff and blob size limit names See merge request !11776
| * | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-292-3/+3
| | | | | |
* | | | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-3119-39/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename BuildsController to JobsController Closes #30699 See merge request !11407
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-312-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3140-178/+210
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| * | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2670-306/+447
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-1814-51/+43
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (31 commits) Remove 'no changes' entries from changelog Check if OLD is set when migrating issue assignees Fix data migration from trigger schedules Replace EFS section in AWS guide Add warning about AWS EFS and performance Consolidate opening text from about.gitlab.com and add active/passive note Fix invalid object reference in ee_compat_check script Fix Ordered Task List Items Add auxiliary viewer for README Update fe_guide testing.md Add auxiliary blob viewer for CHANGELOG Add spec for last commit info when browsing repository files Show last commit for current tree on tree page Use same last commit widget on project homepage and tree view Fix unassigned checkmark Add missing changelog for iPython notebook rendering feature Convert fa-history to svg; tweak alignment Get rid of pluck in app/services/members/authorized_destroy_service.rb Removes duplicate environment variable in documentation Fixed spacing issues in issue sidebar ...
| * | | | | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-1719-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
* | | | | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-311-5/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue inline editing Closes #24873 See merge request !11322
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-3061-315/+496
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-2575-257/+263
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Changed all data to come through the JSON script elementPhil Hughes2017-05-241-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-221-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'issue-edit-inline' into issue-edit-inline-move-projectPhil Hughes2017-05-181-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | | | Added move to project in issue inline edit formPhil Hughes2017-05-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | | | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-confidentialissue-edit-inline-confidentialPhil Hughes2017-05-171-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]