summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Unblocks user when active_directory is disabled and it can be foundpatch/fix-ldap-unblock-user-logicGabriel Mazetto2016-04-051-1/+4
|
* Merge branch 'rs-banzai-requires' into 'master' Rémy Coutable2016-03-3018-38/+0
|\ | | | | | | | | | | | | | | | | | | | | Remove redundant `require`s from Banzai files We're trying to avoid circular dependency errors. Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/13521 Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/8/ See merge request !3391
| * Remove redundant `require`s from Banzai filesrs-banzai-requiresRobert Speicher2016-03-2418-38/+0
| | | | | | | | We're trying to avoid circular dependency errors.
* | Merge branch ↵Robert Speicher2016-03-292-12/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' api - expose label description Resolves #14415 See merge request !3314
| * | api - expose label descriptionMariusz Jachimowicz2016-03-242-12/+14
| |/
* | Back dating of issues when creating throught the APIZeger-Jan van de Weg2016-03-281-6/+10
|/
* Explain why ExclusiveLease has no #cancellease-design-commentsJacob Vosmaer2016-03-241-0/+21
| | | | [ci skip]
* Avoid using the same name between methods and variablesLin Jen-Shin2016-03-231-7/+7
|
* Fix build dependencies, when the dependency is a stringKamil Trzcinski2016-03-231-2/+2
|
* Merge branch 'drop_db_before_restore' into 'master' Robert Speicher2016-03-222-8/+61
|\ | | | | | | | | | | | | | | | | | | | | | | Reload the schema before restoring a database backup If a user tries to downgrade and restore after a failed upgrade, the database may still contain newer tables. Reload the older schema before restoring the database to avoid future upgrade problems. Also, add a rake task to help users add migration versions to the database so it's easier to recover from these errors if they do occur. Fixes #13419 See merge request !2807
| * Reload the schema before restoring a database backupDrew Blessing2016-03-212-8/+61
| |
* | Merge branch 'feature-ci-only-except-trigger' into 'master' Kamil Trzciński2016-03-221-8/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic: - If the repository is tagged, do a build. - Any other normal commits should not cause a build. - If a build is triggered via the API, always create one for the specified ref. From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration: ```yaml only: - tags - triggers ``` I updated the tests and documentation to reflect this and everything seems to pass. See merge request !3230
| * | make conditional a bit clearerJason Roehm2016-03-151-1/+1
| | |
| * | fixed missing argument in listJason Roehm2016-03-151-1/+1
| | |
| * | fix rubocop violationJason Roehm2016-03-151-1/+1
| | |
| * | add 'triggers' keyword to gitlab-ci.yml 'only' and 'except' fields to allow ↵Jason Roehm2016-03-151-7/+8
| | | | | | | | | | | | control over whether triggers will cause jobs to run
* | | Merge branch 'master' into issue_12658Douwe Maan2016-03-216-6/+115
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * | Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-213-1/+97
| |\ \
| | * | Do not rewrite reference if already a cross referenceGrzegorz Bizon2016-03-211-2/+4
| | | |
| | * | Find referable for each ref found in references rewriterGrzegorz Bizon2016-03-201-10/+4
| | | |
| | * | Rename reference unfolder to rewriter, minor refactoringsGrzegorz Bizon2016-03-201-16/+16
| | | |
| | * | Update reference unfolder according to recent ability changesGrzegorz Bizon2016-03-191-2/+3
| | | | | | | | | | | | | | | | | | | | Commit 43d8bdb4f048cbeb5675ed9120cb1aeb415b9586 introduced additional checks for permissions to read issue in references extractor.
| | * | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-1910-10/+102
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
| | * | | Improvements in issue move feaure (refactoring)Grzegorz Bizon2016-03-192-19/+16
| | | | | | | | | | | | | | | | | | | | According to endbosses' suggestions.
| | * | | Add minor improvements in code related to issue moveGrzegorz Bizon2016-03-171-3/+24
| | | | |
| | * | | Add implementation of reference unfolder using banzaiGrzegorz Bizon2016-03-172-5/+49
| | | | |
| | * | | Move reference unfolder for GFM to separate classGrzegorz Bizon2016-03-174-64/+38
| | | | |
| | * | | Do not unfold non-referables when moving an issueGrzegorz Bizon2016-03-171-0/+2
| | | | |
| | * | | Use internal reference extractor in banzai unfold pipelineGrzegorz Bizon2016-03-172-21/+27
| | | | |
| | * | | Add reference unfold pipeline used when moving issueGrzegorz Bizon2016-03-172-0/+55
| | | | |
| * | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-212-10/+4
| | | | |
| * | | | minor improvements and fixed specsZeger-Jan van de Weg2016-03-193-6/+5
| | | | |
| * | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-191-2/+3
| | | | |
| * | | | Soft delete issuablesZeger-Jan van de Weg2016-03-192-2/+21
| | |/ / | |/| |
* | | | Fix specsDouwe Maan2016-03-201-4/+0
| | | |
* | | | Tweaks, refactoring, and specsDouwe Maan2016-03-202-1/+3
| | | |
* | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-2012-10/+103
|\ \ \ \ | |/ / /
| * | | Merge branch 'confidential-issues' into 'master' Douwe Maan2016-03-184-5/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confidential issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678 More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227 See merge request !3282
| | * | | Restrict access to confidential issues on search resultsDouglas Barbosa Alexandre2016-03-172-4/+6
| | | | |
| | * | | Restrict access to confidential issues through APIDouglas Barbosa Alexandre2016-03-171-1/+2
| | | | |
| | * | | Restrict access to references for confidential issuesDouglas Barbosa Alexandre2016-03-171-0/+5
| | | | |
| * | | | Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster.
| * | | Merge branch 'artem-forks/gitlab-ce-nginx-rel-url'Jacob Vosmaer2016-03-172-2/+19
| |\ \ \
| | * | | Do not serve anything via nginx as we have workhorseArtem Sidorenko2016-03-112-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise this might 'hide' problems https://github.com/gitlabhq/gitlabhq/issues/10053#issuecomment-188919319
| * | | | Merge branch 'patch/refactor-post-receive' into 'master' Douwe Maan2016-03-171-0/+60
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostReceive refactor Back-ported PostReceive refactor made for https://gitlab.com/gitlab-org/gitlab-ee/issues/367 in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/267 See merge request !3264
| | * | | | Back-porting PostReceive refactor made for EE 🍺Gabriel Mazetto2016-03-171-0/+60
| | | | | |
| * | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-172-3/+6
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| | * | | | Add missing API docs on external userAchilleas Pipinellis2016-03-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | API support for setting External flag on existing usersZeger-Jan van de Weg2016-03-171-1/+2
| | | | | |
| * | | | | Follow the CSS Style Guide rules for unitless zero values.connorshea2016-03-161-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Emoji Rake task to conform to style guide. Discussed in #14299. [ci skip]
View Lorry Controller Status